Merge branch 'master' into stable

This commit is contained in:
Saverio Miroddi 2020-04-27 00:53:59 +02:00
commit 30d370e4d0
2 changed files with 17 additions and 10 deletions

View File

@ -28,14 +28,22 @@ RAID-1 (mirroring) is supported, with any arbitrary number of disks; the boot an
It's fairly easy to extend the program to support other Debian-based operating systems (e.g. older/newer Ubuntu's, etc.) - the project is (very) open to feature requests. It's fairly easy to extend the program to support other Debian-based operating systems (e.g. older/newer Ubuntu's, etc.) - the project is (very) open to feature requests.
## Advantages over the Ubuntu built-in installer ## Comparison with Ubuntu built-in installer
With Ubuntu 19.10, Canonical released an experimental ZFS installer. The advantages of this project over this installer are: As of 20.04, Canonical makes available an experimental ZFS installer on Ubuntu Desktop.
1. on production systems, it's undesirable to use a non-LTS version; The advantages of this project over the Ubuntu installer are:
2. the experimental Ubuntu installer is unconfigurable; it generates a fixed setup.
additionally, as explained in the previous section, the script can be easily adapted for other operating systems. 1. it supports pools configuration;
2. it allows customization of the disks setup (including mirroring);
3. it supports additional features (e.g. encryption);
4. it supports many more operating systems;
5. it supports unattended installations, via custom scripts;
6. it's easy to extend.
The disadvantages are:
1. the Ubuntu installer has a more sophisticated filesystem layout - it separates base directories into different ZFS filesystems (this is planned to be implemented in the ZFS installer as well).
## Instructions ## Instructions
@ -56,12 +64,12 @@ Ubuntu Server requires a slightly different execution procedure:
the rest is the same as the generic procedure. the rest is the same as the generic procedure.
### Issues/unsupported systems ### Unsupported systems/Issues
Due to a current problem with the zpool expansion, 12 GiB of empty space are left at the end of each disk.
The Ubuntu Server alternate (non-live) version is not supported, as it's based on the Busybox environment, which lacks several tools used in the installer (apt, rsync...). The Ubuntu Server alternate (non-live) version is not supported, as it's based on the Busybox environment, which lacks several tools used in the installer (apt, rsync...).
The installer itself can run over SSH (\[S\]Ubiquity of course needs to be still run in the desktop environment, unless a custom script is provided), however, GNU Screen sessions may break, due to the virtual filesystems rebinding/chrooting. This is not an issue with the ZFS installer; it's a necessary step of the destination configuration.
### Unattended installations ### Unattended installations
The program supports unattended installation, via environment variables. The program built-in help explains all the options: The program supports unattended installation, via environment variables. The program built-in help explains all the options:

View File

@ -923,8 +923,6 @@ function sync_os_temp_installation_dir_to_rpool {
function remove_temp_partition_and_expand_rpool { function remove_temp_partition_and_expand_rpool {
print_step_info_header print_step_info_header
parted -s "${v_selected_disks[0]}" rm 4
if [[ $v_free_tail_space -eq 0 ]]; then if [[ $v_free_tail_space -eq 0 ]]; then
local resize_reference=100% local resize_reference=100%
else else
@ -932,6 +930,7 @@ function remove_temp_partition_and_expand_rpool {
fi fi
for selected_disk in "${v_selected_disks[@]}"; do for selected_disk in "${v_selected_disks[@]}"; do
parted -s "$selected_disk" rm 4
parted -s "$selected_disk" unit s resizepart 3 -- "$resize_reference" parted -s "$selected_disk" unit s resizepart 3 -- "$resize_reference"
zpool online -e "$v_rpool_name" "$selected_disk-part3" zpool online -e "$v_rpool_name" "$selected_disk-part3"
done done