diff options
| author | Lorenz Hüdepohl <[email protected]> | 2021-01-21 21:59:24 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-21 12:59:24 -0800 |
| commit | 984362a71ebef106d05a8f68f241c5c610ff6547 (patch) | |
| tree | 18d86df6048650ec3ecb1a96ea7acc9efd0816b6 | |
| parent | 0ae733c7a42d91b0955ca5394b4dba4eb9c76dca (diff) | |
dracut: Support /usr/bin as 'systemctl' path
On openSUSE the initrd has systemctl in /usr/bin, check this path as
well.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Signed-off-by: Lorenz Hüdepohl <[email protected]>
Closes #11487
| -rw-r--r-- | contrib/dracut/90zfs/zfs-env-bootfs.service.in | 2 | ||||
| -rwxr-xr-x | contrib/dracut/90zfs/zfs-load-key.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/dracut/90zfs/zfs-env-bootfs.service.in b/contrib/dracut/90zfs/zfs-env-bootfs.service.in index 3cdf69100..2bc43482c 100644 --- a/contrib/dracut/90zfs/zfs-env-bootfs.service.in +++ b/contrib/dracut/90zfs/zfs-env-bootfs.service.in @@ -8,7 +8,7 @@ Before=zfs-import.target [Service] Type=oneshot -ExecStart=/bin/sh -c "/bin/systemctl set-environment BOOTFS=$(@sbindir@/zpool list -H -o bootfs | grep -m1 -v '^-$')" +ExecStart=/bin/sh -c "systemctl set-environment BOOTFS=$(@sbindir@/zpool list -H -o bootfs | grep -m1 -v '^-$')" [Install] WantedBy=zfs-import.target diff --git a/contrib/dracut/90zfs/zfs-load-key.sh.in b/contrib/dracut/90zfs/zfs-load-key.sh.in index e29501418..9b7716ae9 100755 --- a/contrib/dracut/90zfs/zfs-load-key.sh.in +++ b/contrib/dracut/90zfs/zfs-load-key.sh.in @@ -1,7 +1,7 @@ #!/bin/sh # only run this on systemd systems, we handle the decrypt in mount-zfs.sh in the mount hook otherwise -[ -e /bin/systemctl ] || return 0 +[ -e /bin/systemctl ] || [ -e /usr/bin/systemctl ] || return 0 # This script only gets executed on systemd systems, see mount-zfs.sh for non-systemd systems |