mirror of
https://github.com/jiangcuo/zfsonlinux.git
synced 2025-08-26 00:18:40 +00:00
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
Description: explicitly load the ZFS module via systemd service
|
|
Author: Ubuntu developers
|
|
Forwarded: not needed
|
|
--- a/etc/systemd/system/zfs-import-cache.service.in
|
|
+++ b/etc/systemd/system/zfs-import-cache.service.in
|
|
@@ -3,7 +3,9 @@
|
|
Documentation=man:zpool(8)
|
|
DefaultDependencies=no
|
|
Requires=systemd-udev-settle.service
|
|
+Requires=zfs-load-module.service
|
|
After=systemd-udev-settle.service
|
|
+After=zfs-load-module.service
|
|
After=cryptsetup.target
|
|
After=multipathd.service
|
|
After=systemd-remount-fs.service
|
|
--- a/etc/systemd/system/zfs-import-scan.service.in
|
|
+++ b/etc/systemd/system/zfs-import-scan.service.in
|
|
@@ -3,7 +3,9 @@
|
|
Documentation=man:zpool(8)
|
|
DefaultDependencies=no
|
|
Requires=systemd-udev-settle.service
|
|
+Requires=zfs-load-module.service
|
|
After=systemd-udev-settle.service
|
|
+After=zfs-load-module.service
|
|
After=cryptsetup.target
|
|
After=multipathd.service
|
|
Before=zfs-import.target
|
|
--- /dev/null
|
|
+++ b/etc/systemd/system/zfs-load-module.service.in
|
|
@@ -0,0 +1,17 @@
|
|
+[Unit]
|
|
+Description=Install ZFS kernel module
|
|
+DefaultDependencies=no
|
|
+Requires=systemd-udev-settle.service
|
|
+After=systemd-udev-settle.service
|
|
+After=cryptsetup.target
|
|
+Before=dracut-mount.service
|
|
+After=systemd-remount-fs.service
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+RemainAfterExit=yes
|
|
+ExecStart=/usr/sbin/modprobe zfs
|
|
+
|
|
+[Install]
|
|
+WantedBy=zfs-mount.service
|
|
+WantedBy=zfs.target
|
|
--- a/contrib/dracut/90zfs/module-setup.sh.in
|
|
+++ b/contrib/dracut/90zfs/module-setup.sh.in
|
|
@@ -95,7 +95,8 @@
|
|
|
|
for _service in \
|
|
"zfs-import-scan.service" \
|
|
- "zfs-import-cache.service"; do
|
|
+ "zfs-import-cache.service" \
|
|
+ "zfs-load-module.service"; do
|
|
inst_simple "${systemdsystemunitdir}/${_service}"
|
|
systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}"
|
|
|
|
--- a/etc/Makefile.am
|
|
+++ b/etc/Makefile.am
|
|
@@ -52,6 +52,7 @@
|
|
%D%/systemd/system/50-zfs.preset
|
|
|
|
systemdunit_DATA = \
|
|
+ %D%/systemd/system/zfs-load-module.service \
|
|
%D%/systemd/system/zfs-import-cache.service \
|
|
%D%/systemd/system/zfs-import-scan.service \
|
|
%D%/systemd/system/zfs-import.target \
|
|
--- a/etc/systemd/system/50-zfs.preset
|
|
+++ b/etc/systemd/system/50-zfs.preset
|
|
@@ -7,3 +7,4 @@
|
|
enable zfs-zed.service
|
|
enable zfs-volume-wait.service
|
|
enable zfs.target
|
|
+enable zfs-load-module.service
|