diff options
| author | Manuel Amador (Rudd-O) <[email protected]> | 2016-04-24 11:35:44 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-12 14:31:15 -0700 |
| commit | d402c18dd60124525b253b27c5018f54a030928d (patch) | |
| tree | 1057315f14baad460620b4340a9f312d57432463 /etc | |
| parent | 8adb798aa50849cc3f6e099fcae7c29db1b83e39 (diff) | |
A collection of dracut fixes
- In older systems without sysroot.mount, import before dracut-mount,
and re-enable old dracut mount hook
- rootflags MUST be present even if the administrator neglected to
specify it explicitly
- Check that mount.zfs exists in sbindir
- Remove awk and head as (now unused) requirements, add grep, and
install the right mount.zfs
- Eliminate one use of grep in Dracut
- Use a more accurate grepping statement to identify zfsutil in rootflags
- Ensure that pooldev is nonempty
- Properly handle /dev/sd* devices and more
- Use new -P to get list of zpool devices
- Bail out of the generator when zfs:AUTO is on the root command line
- Ignore errors from systemctl trying to load sysroot.mount, we only
care about the output
- Determine which one is the correct initqueuedir at run time.
- Add a compatibility getargbool for our detection / setup script.
- Update dracut .gitignore files
Signed-off-by: <Matthew Thode [email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4558
Closes #4562
Diffstat (limited to 'etc')
| -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, 2 insertions, 0 deletions
diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index b1deb6ed9..a567b3095 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -4,6 +4,7 @@ DefaultDependencies=no Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target +Before=dracut-mount.service ConditionPathExists=@sysconfdir@/zfs/zpool.cache [Service] diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in index 517e12e3a..cb3c2a7bd 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -4,6 +4,7 @@ DefaultDependencies=no Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target +Before=dracut-mount.service ConditionPathExists=!@sysconfdir@/zfs/zpool.cache [Service] |