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

Merge pull request #183 from saveriomiroddi/merge_debian_grub_configuration

Browse Source 
Merge Debian-specific GRUB configuration with regular one
This commit is contained in:
Saverio Miroddi 2021-04-26 22:22:03 +02:00
commit c430c7abc6
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install-zfs.sh
View File

@ -1307,17 +1307,6 @@ function configure_and_update_grub {
chroot_execute "update-grub"
}
function configure_and_update_grub_Debian {
print_step_info_header
chroot_execute "perl -i -pe 's/GRUB_CMDLINE_LINUX_DEFAULT=\"\K/init_on_alloc=0 /' /etc/default/grub"
chroot_execute "perl -i -pe 's/GRUB_CMDLINE_LINUX_DEFAULT=.*\Kquiet//' /etc/default/grub"
chroot_execute "perl -i -pe 's/#(GRUB_TERMINAL=console)/\$1/' /etc/default/grub"
chroot_execute "update-grub"
}
function sync_efi_partitions {
print_step_info_header
@ -1545,7 +1534,7 @@ fi
prepare_jail
distro_dependent_invoke "install_jail_zfs_packages"
prepare_efi_partition
distro_dependent_invoke "configure_and_update_grub"
configure_and_update_grub
sync_efi_partitions
update_initramfs
fix_filesystem_mount_ordering