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

Make the distro-specific functions use invoke(), when calling the parent

Browse Source
This commit is contained in:
Saverio Miroddi 2021-04-27 13:43:16 +02:00
parent e176be6521
commit 8363b37ccc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install-zfs.sh
View File

@ -465,7 +465,7 @@ function set_zfs_ppa_requirement_Debian {
function set_zfs_ppa_requirement_Linuxmint { function set_zfs_ppa_requirement_Linuxmint {
perl -i -pe 's/^(deb cdrom)/# $1/' /etc/apt/sources.list perl -i -pe 's/^(deb cdrom)/# $1/' /etc/apt/sources.list
set_zfs_ppa_requirement invoke "set_zfs_ppa_requirement"
} }
# By using a FIFO, we avoid having to hide statements like `echo $v_passphrase | zpoool create ...` # By using a FIFO, we avoid having to hide statements like `echo $v_passphrase | zpoool create ...`
@ -794,7 +794,7 @@ function install_host_packages_Debian {
function install_host_packages_Linuxmint { function install_host_packages_Linuxmint {
apt install --yes zfsutils-linux apt install --yes zfsutils-linux
install_host_packages invoke "install_host_packages"
} }
function install_host_packages_elementary { function install_host_packages_elementary {
@ -803,7 +803,7 @@ function install_host_packages_elementary {
apt install --yes software-properties-common apt install --yes software-properties-common
fi fi
install_host_packages invoke "install_host_packages"
} }
function install_host_packages_UbuntuServer { function install_host_packages_UbuntuServer {
@ -1214,14 +1214,14 @@ APT'
function install_jail_zfs_packages_elementary { function install_jail_zfs_packages_elementary {
chroot_execute "apt install --yes software-properties-common" chroot_execute "apt install --yes software-properties-common"
install_jail_zfs_packages invoke "install_jail_zfs_packages"
} }
function install_jail_zfs_packages_UbuntuServer { function install_jail_zfs_packages_UbuntuServer {
if [[ $v_use_ppa != "1" ]]; then if [[ $v_use_ppa != "1" ]]; then
chroot_execute "apt install --yes zfsutils-linux zfs-initramfs grub-efi-amd64-signed shim-signed" chroot_execute "apt install --yes zfsutils-linux zfs-initramfs grub-efi-amd64-signed shim-signed"
else else
install_jail_zfs_packages invoke "install_jail_zfs_packages"
fi fi
} }