53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthew Thode <mthode@mthode.org>
|
||
|
|
Date: Wed, 21 Feb 2018 22:45:35 +0000
|
||
|
|
Subject: [PATCH] Allow modprobe to fail when called within systemd
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This allows for systems with zfs built into the kernel manually to run
|
||
|
|
these services. Otherwise the service will fail to start.
|
||
|
|
|
||
|
|
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
|
||
|
|
Reviewed-by: Kash Pande <kash@tripleback.net>
|
||
|
|
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||
|
|
Signed-off-by: Matthew Thode <mthode@mthode.org>
|
||
|
|
Closes #7174
|
||
|
|
(cherry picked from commit 30ac8de48a2bb680e15dfe8879faaa7b461b771c)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
etc/systemd/system/zfs-import-cache.service.in | 2 +-
|
||
|
|
etc/systemd/system/zfs-import-scan.service.in | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
|
||
|
|
index 9d677f8dd..726c468ca 100644
|
||
|
|
--- a/etc/systemd/system/zfs-import-cache.service.in
|
||
|
|
+++ b/etc/systemd/system/zfs-import-cache.service.in
|
||
|
|
@@ -12,7 +12,7 @@ ConditionPathExists=@sysconfdir@/zfs/zpool.cache
|
||
|
|
[Service]
|
||
|
|
Type=oneshot
|
||
|
|
RemainAfterExit=yes
|
||
|
|
-ExecStartPre=/sbin/modprobe zfs
|
||
|
|
+ExecStartPre=-/sbin/modprobe zfs
|
||
|
|
ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN
|
||
|
|
|
||
|
|
[Install]
|
||
|
|
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
|
||
|
|
index cc428b0d0..8fe2c1072 100644
|
||
|
|
--- a/etc/systemd/system/zfs-import-scan.service.in
|
||
|
|
+++ b/etc/systemd/system/zfs-import-scan.service.in
|
||
|
|
@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
|
||
|
|
[Service]
|
||
|
|
Type=oneshot
|
||
|
|
RemainAfterExit=yes
|
||
|
|
-ExecStartPre=/sbin/modprobe zfs
|
||
|
|
+ExecStartPre=-/sbin/modprobe zfs
|
||
|
|
ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
|
||
|
|
|
||
|
|
[Install]
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|