From eec5ba113e1d285d445333079a3e8184872ad00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 10 Jun 2021 18:26:37 +0200 Subject: [PATCH] dracut: 90zfs: respect zfs_force=1 on systemd systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On systemd systems provide an environment generator in order to respect the zfs_force=1 kernel command line option. Reviewed-by: Brian Behlendorf Reviewed-by: Tony Nguyen Signed-off-by: Ahelenia Ziemiańska Closes #11403 Closes #12195 --- contrib/dracut/90zfs/.gitignore | 13 ++------- contrib/dracut/90zfs/Makefile.am | 3 ++- .../dracut/90zfs/import-opts-generator.sh.in | 5 ++++ contrib/dracut/90zfs/module-setup.sh.in | 27 +++++++++++++------ .../system/zfs-import-cache.service.in | 2 +- etc/systemd/system/zfs-import-scan.service.in | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) create mode 100755 contrib/dracut/90zfs/import-opts-generator.sh.in diff --git a/contrib/dracut/90zfs/.gitignore b/contrib/dracut/90zfs/.gitignore index dce24393479b..cb84212f3a2a 100644 --- a/contrib/dracut/90zfs/.gitignore +++ b/contrib/dracut/90zfs/.gitignore @@ -1,11 +1,2 @@ -export-zfs.sh -module-setup.sh -mount-zfs.sh -parse-zfs.sh -zfs-generator.sh -zfs-lib.sh -zfs-load-key.sh -zfs-needshutdown.sh -zfs-env-bootfs.service -zfs-snapshot-bootfs.service -zfs-rollback-bootfs.service +*.sh +*.service diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index ff3a2b27f24e..3f7050300994 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -10,7 +10,8 @@ pkgdracut_SCRIPTS = \ zfs-generator.sh \ zfs-load-key.sh \ zfs-needshutdown.sh \ - zfs-lib.sh + zfs-lib.sh \ + import-opts-generator.sh pkgdracut_DATA = \ zfs-env-bootfs.service \ diff --git a/contrib/dracut/90zfs/import-opts-generator.sh.in b/contrib/dracut/90zfs/import-opts-generator.sh.in new file mode 100755 index 000000000000..8bc8c9b35b73 --- /dev/null +++ b/contrib/dracut/90zfs/import-opts-generator.sh.in @@ -0,0 +1,5 @@ +#!/bin/sh + +. /lib/dracut-zfs-lib.sh + +echo ZPOOL_IMPORT_OPTS="$ZPOOL_IMPORT_OPTS" diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 817da5b2b4a9..a4b62da1f742 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -104,29 +104,40 @@ install() { if dracut_module_included "systemd"; then mkdir -p "${initdir}/$systemdsystemunitdir/zfs-import.target.wants" - for _item in scan cache ; do - dracut_install @systemdunitdir@/zfs-import-$_item.service - if ! [ -L "${initdir}/$systemdsystemunitdir/zfs-import.target.wants"/zfs-import-$_item.service ]; then - ln -s ../zfs-import-$_item.service "${initdir}/$systemdsystemunitdir/zfs-import.target.wants"/zfs-import-$_item.service - type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-import-$_item.service + for _service in "zfs-import-scan.service" "zfs-import-cache.service" ; do + dracut_install "@systemdunitdir@/$_service" + if ! [ -L "${initdir}/$systemdsystemunitdir/zfs-import.target.wants/$_service" ]; then + ln -sf ../$_service "${initdir}/$systemdsystemunitdir/zfs-import.target.wants/$_service" + type mark_hostonly >/dev/null 2>&1 && mark_hostonly "@systemdunitdir@/$_service" fi done + inst "${moddir}"/zfs-env-bootfs.service "${systemdsystemunitdir}"/zfs-env-bootfs.service ln -s ../zfs-env-bootfs.service "${initdir}/${systemdsystemunitdir}/zfs-import.target.wants"/zfs-env-bootfs.service type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-env-bootfs.service + dracut_install systemd-ask-password dracut_install systemd-tty-ask-password-agent + mkdir -p "${initdir}/$systemdsystemunitdir/initrd.target.wants" dracut_install @systemdunitdir@/zfs-import.target if ! [ -L "${initdir}/$systemdsystemunitdir/initrd.target.wants"/zfs-import.target ]; then ln -s ../zfs-import.target "${initdir}/$systemdsystemunitdir/initrd.target.wants"/zfs-import.target type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-import.target fi + for _service in zfs-snapshot-bootfs.service zfs-rollback-bootfs.service ; do - inst "${moddir}"/$_service "${systemdsystemunitdir}"/$_service - if ! [ -L "${initdir}/$systemdsystemunitdir/initrd.target.wants"/$_service ]; then - ln -s ../$_service "${initdir}/$systemdsystemunitdir/initrd.target.wants"/$_service + inst "${moddir}/$_service" "${systemdsystemunitdir}/$_service" + if ! [ -L "${initdir}/$systemdsystemunitdir/initrd.target.wants/$_service" ]; then + ln -s "../$_service" "${initdir}/$systemdsystemunitdir/initrd.target.wants/$_service" fi done + + # There isn't a pkg-config variable for this, + # and dracut doesn't automatically resolve anything this'd be next to + local systemdsystemenvironmentgeneratordir + systemdsystemenvironmentgeneratordir="$(pkg-config --variable=prefix systemd || echo "/usr")/lib/systemd/system-environment-generators" + mkdir -p "${initdir}/${systemdsystemenvironmentgeneratordir}" + inst "${moddir}"/import-opts-generator.sh "${systemdsystemenvironmentgeneratordir}"/zfs-import-opts.sh fi } diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index 0d236fe9e468..b09961a8bb84 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN +ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN ${ZPOOL_IMPORT_OPTS} [Install] WantedBy=zfs-import.target diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in index f0317e23e508..c1111c73a607 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@sbindir@/zpool import -aN -o cachefile=none +ExecStart=@sbindir@/zpool import -aN -o cachefile=none ${ZPOOL_IMPORT_OPTS} [Install] WantedBy=zfs-import.target