diff options
| author | Michael Niewöhner <[email protected]> | 2019-04-03 02:14:39 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-04-02 17:14:39 -0700 |
| commit | ce4432c5424eb9aa4d00833ee7529cf24491bdde (patch) | |
| tree | 90a31dd531a2d3f12d868816bd9e9fc05bae5726 /etc/systemd/system | |
| parent | f72ecb8d2779ef8b3e8892280c8c8756a419e461 (diff) | |
Move dracut specifics to dracut module
Dracut depends on the environment variable BOOTFS to be set after pool
import. This dracut specific systemd ExecStartPost command should not be
called for any non-dracut systems, so let's move it to a static systemd
unit that.
Reviewed-by: Manuel Amador (Rudd-O) <[email protected]>
Reviewed-by: Matthew Thode <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Michael Niewöhner <[email protected]>
Closes #8510
Diffstat (limited to 'etc/systemd/system')
| -rw-r--r-- | etc/systemd/system/zfs-import-cache.service.in | 1 | ||||
| -rw-r--r-- | etc/systemd/system/zfs-import-scan.service.in | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index 8087a294d..cacb53651 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -13,7 +13,6 @@ ConditionPathExists=@sysconfdir@/zfs/zpool.cache Type=oneshot RemainAfterExit=yes ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN -ExecStartPost=/bin/sh -c "/bin/systemctl set-environment BOOTFS=$(@sbindir@/zpool list -H -o bootfs | grep -m1 -v '^-$')" [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 802328da3..4aae9f06e 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -12,7 +12,6 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache Type=oneshot RemainAfterExit=yes ExecStart=@sbindir@/zpool import -aN -o cachefile=none -ExecStartPost=/bin/sh -c "/bin/systemctl set-environment BOOTFS=$(@sbindir@/zpool list -H -o bootfs | grep -m1 -v '^-$')" [Install] WantedBy=zfs-import.target |