From 8363b37cccda29b99c111da402a31b83e2035d3d Mon Sep 17 00:00:00 2001 From: Saverio Miroddi Date: Tue, 27 Apr 2021 13:43:16 +0200 Subject: [PATCH] Make the distro-specific functions use invoke(), when calling the parent --- install-zfs.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install-zfs.sh b/install-zfs.sh index 3877090..29bd464 100755 --- a/install-zfs.sh +++ b/install-zfs.sh @@ -465,7 +465,7 @@ function set_zfs_ppa_requirement_Debian { function set_zfs_ppa_requirement_Linuxmint { 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 ...` @@ -794,7 +794,7 @@ function install_host_packages_Debian { function install_host_packages_Linuxmint { apt install --yes zfsutils-linux - install_host_packages + invoke "install_host_packages" } function install_host_packages_elementary { @@ -803,7 +803,7 @@ function install_host_packages_elementary { apt install --yes software-properties-common fi - install_host_packages + invoke "install_host_packages" } function install_host_packages_UbuntuServer { @@ -1214,14 +1214,14 @@ APT' function install_jail_zfs_packages_elementary { chroot_execute "apt install --yes software-properties-common" - install_jail_zfs_packages + invoke "install_jail_zfs_packages" } function install_jail_zfs_packages_UbuntuServer { if [[ $v_use_ppa != "1" ]]; then chroot_execute "apt install --yes zfsutils-linux zfs-initramfs grub-efi-amd64-signed shim-signed" else - install_jail_zfs_packages + invoke "install_jail_zfs_packages" fi }