rei-forks
/
zfs-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New workflow for custom OS installation scripts 

In case of custom OS installations, the pools are now prepared before. There are two reasons for this:

1. there is no need to run them after, since we're not subject to Ubiquity's mess-ups;
2. custom installation scripts have the flexibility to install directly to a pool, as they're not subject to Ubiquity's limitations.
This commit is contained in:
Saverio Miroddi 2020-05-05 23:04:53 +02:00
parent 3b1a8cd3a9
commit efe75eb994
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install-zfs.sh
View File

@ -1356,15 +1356,19 @@ setup_partitions
if [[ "${ZFS_OS_INSTALLATION_SCRIPT:-}" == "" ]]; then if [[ "${ZFS_OS_INSTALLATION_SCRIPT:-}" == "" ]]; then
# Includes the O/S extra configuration, if necessary (network, root pwd, etc.) # Includes the O/S extra configuration, if necessary (network, root pwd, etc.)
distro_dependent_invoke "install_operating_system" distro_dependent_invoke "install_operating_system"
create_pools
create_swap_volume
sync_os_temp_installation_dir_to_rpool
remove_temp_partition_and_expand_rpool
else else
create_pools
create_swap_volume
remove_temp_partition_and_expand_rpool
custom_install_operating_system custom_install_operating_system
fi fi
create_pools
create_swap_volume
sync_os_temp_installation_dir_to_rpool
remove_temp_partition_and_expand_rpool
prepare_jail prepare_jail
distro_dependent_invoke "install_jail_zfs_packages" distro_dependent_invoke "install_jail_zfs_packages"
distro_dependent_invoke "install_and_configure_bootloader" distro_dependent_invoke "install_and_configure_bootloader"