Merge pull request #10 from darrenldl/dev

Fixed partitioning code, added code to use reflector, added code for SSH pub keys transfer

Author: darrenldl

.travis.yml

@@ -9,7 +9,7 @@ services:
 
 before_install:
   - docker pull ocaml/opam2:alpine
-  - docker run -td --name installer_builder -v $(pwd):/home/opam/llsh-master ocaml/opam2:alpine
+  - docker run -td --name installer_builder -v $(pwd):/home/opam/oali-master ocaml/opam2:alpine
   - docker exec installer_builder sudo apk add m4
   - docker exec installer_builder opam install dune
   - docker exec installer_builder opam install core_kernel
@@ -21,10 +21,10 @@ before_install:
 script:
   - docker exec installer_builder bash -c 'cd ~; echo $(pwd)'
   - docker exec installer_builder bash -c 'cd ~; ls'
-  - docker exec installer_builder bash -c 'cp -r ~/llsh-master ~/llsh'
+  - docker exec installer_builder bash -c 'cp -r ~/oali-master ~/oali'
   - docker exec installer_builder bash -c 'chmod u=rwx ~/llsh'
-  - docker exec installer_builder bash -c 'eval $(opam env); cd ~/llsh/installer_ml; make'
-  - docker cp installer_builder:/home/opam/llsh/installer_ml/_build/default/src/installer.exe ./installer
+  - docker exec installer_builder bash -c 'eval $(opam env); cd ~/oali/installer_ml; make'
+  - docker cp installer_builder:/home/opam/oali/installer_ml/_build/default/src/installer.exe ./installer
   - strip installer
 
 deploy:
@@ -34,7 +34,7 @@ deploy:
   file: installer
   on:
     tags: true
-    repo: darrenldl/ocaml-linux-installer
+    repo: darrenldl/oali
   skip_cleanup: true
 
 notifications:

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.0.3
+- Fixed boot partition cryptsetup parameters adjustment task unit
+- Fixed partition size percentage calculation
+- Fixed partition name computation code
+  - Previously partition name may not be correctly deduced during formatting
+- Added task unit for using `reflector` to generate more optimised mirrorlist
+- Added SSH server setup and SSH keys transfer code
+
 # 0.0.2
 - Added following user options when task unit fails
   - Skip

README.md

@@ -1,16 +1,16 @@
-# ocaml-linux-installer
-[![Build Status](https://travis-ci.org/darrenldl/ocaml-linux-installer.svg?branch=master)](https://travis-ci.org/darrenldl/ocaml-linux-installer)
+# OCaml Arch Linux Installer
+[![Build Status](https://travis-ci.org/darrenldl/oali.svg?branch=master)](https://travis-ci.org/darrenldl/oali)
 
 ### Description
-The installer written in OCaml sets up a Arch Linux installation with following variations
+Oali is an installer written in OCaml which sets up a Arch Linux installation with following variations
 - 3 disk layouts
   - Single system disk (installer does partitioning for you)
   - You pick the partitions for `/boot` `/` etc manually 
   - Single system partition (you pick an existing partition on a disk) + USB key (partitioned by installer)
 - Optional full disk encryption
 - Optional `linux-hardened` kernel installation
 
-The installer aims to be smart and hassle free, so following features are included as a result
+Oali aims to be smart and hassle free, so following features are included as a result
 - Automatic adjustment of dialogues and settings based on whether the live CD is running in UEFI or BIOS mode
 
 ### Encryption specifics

installer_ml/src/config.ml

@@ -1,16 +1,18 @@
 let sys_mount_point = "/mnt"
 
-let esp_part_size_MiB = 550
+let esp_part_size_MiB = 550.0
 
-let esp_part_max_perc = 25
+let esp_part_max_frac = 0.25
 
 let efi_dir = "/efi"
 
 let esp_mount_point = Misc_utils.concat_file_names [sys_mount_point; efi_dir]
 
-let boot_part_size_MiB = 500
+let boot_part_size_MiB = 500.0
 
-let boot_part_max_perc = 75
+let boot_part_max_frac = 0.75
+
+let total_disk_usage_frac = 0.75
 
 let boot_dir = "/boot"
 
@@ -24,7 +26,13 @@ let boot_mapper_name = "crypt_boot"
 
 let root_mapper_name = "crypt_root"
 
-let oli_files_dir_path = "/root/oli_pack"
+let livecd_mirrorlist_path =
+  Misc_utils.concat_file_names ["/etc"; "pacman.d"; "mirrorlist"]
+
+let etc_ssh_dir_path =
+  Misc_utils.concat_file_names [sys_mount_point; "etc"; "ssh"]
+
+let oali_files_dir_path = Misc_utils.concat_file_names ["/root"; "oali_pack"]
 
 let useradd_helper_as_powerful_name = "useradd_helper_as_powerful.sh"
 
@@ -40,4 +48,7 @@ let usb_key_mount_script_name = "usb_key_mount.sh"
 
 let usb_key_unmount_script_name = "usb_key_umount.sh"
 
-let oli_setup_note_name = "oli_setup_note"
+let oali_setup_note_name = "oali_setup_note"
+
+let sshd_config_path_in_repo =
+  Misc_utils.concat_file_names [repo_name; "saltstack"; "salt"; "sshd_config"]

installer_ml/src/disk_utils.ml

@@ -25,6 +25,7 @@ let list_parts () =
       | None ->
         false)
   |> List.map (fun (_, dst) -> dst)
+  |> List.sort_uniq compare
 
 let disk_of_part part =
   let devs = list_disk_block_devs () in
@@ -36,6 +37,11 @@ let disk_of_part part =
   let _, disk_name = List.find (fun (path, _dst) -> path = disk_path) devs in
   disk_name
 
+let parts_of_disk disk =
+  let len = String.length disk in
+  list_parts ()
+  |> List.filter (fun part -> Core_kernel.String.prefix part len = disk)
+
 let list_disks () =
   list_disk_block_devs ()
   |> List.filter (fun (path, _dst) ->
@@ -46,6 +52,7 @@ let list_disks () =
       | None ->
         true)
   |> List.map (fun (_, dst) -> dst)
+  |> List.sort_uniq compare
 
 let disk_size_bytes disk =
   let res =
@@ -54,9 +61,9 @@ let disk_size_bytes disk =
   let size_str = List.hd res.stdout in
   int_of_string size_str
 
-let disk_size_KiB disk = (disk_size_bytes disk + 1024 - 1) / 1024
+let disk_size_KiB disk : float = float_of_int (disk_size_bytes disk) /. 1024.0
 
-let disk_size_MiB disk = (disk_size_KiB disk + 1024 - 1) / 1024
+let disk_size_MiB disk : float = disk_size_KiB disk /. 1024.0
 
 let uuid_of_dev dev =
   let dir = "/dev/disk/by-uuid" in
@@ -71,3 +78,5 @@ let uuid_of_dev dev =
   |> List.filter (fun (s, _) -> s = Filename.basename dev)
   |> List.hd
   |> fun (_, uuid) -> uuid
+
+let sync () = Proc_utils.exec "sync"