From: Fabian Grünbichler Date: Tue, 19 Dec 2017 11:52:00 +0000 (+0100) Subject: cherry-pick zfs-import.target fix X-Git-Tag: zfs-2.0.6-bullseye~180 X-Git-Url: https://git.proxmox.com/?p=zfsonlinux.git;a=commitdiff_plain;h=f7fae412d9f56cef375c6e063b7cd80c7a987716 cherry-pick zfs-import.target fix --- diff --git a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch index 346da6e..45d6b12 100644 --- a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch +++ b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch @@ -1,7 +1,7 @@ From bb4b48440d2048d3f9461753a976b7c102bad5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 6 Feb 2017 11:03:10 +0100 -Subject: [PATCH 1/3] remove DKMS, modules and dracut build +Subject: [PATCH 1/4] remove DKMS, modules and dracut build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch b/zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch index 53ef035..48de018 100644 --- a/zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch +++ b/zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch @@ -1,7 +1,7 @@ From f76e53288b20d1d078bcae5e8a80be50044bfd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 24 Oct 2016 13:47:06 +0200 -Subject: [PATCH 2/3] import with -d /dev/disk/by-id in scan service +Subject: [PATCH 2/4] import with -d /dev/disk/by-id in scan service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch b/zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch index abd4d5c..d3a3751 100644 --- a/zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch +++ b/zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch @@ -1,7 +1,7 @@ From e03f6d99c515ab83c3c6984cab00d6f0392e501f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 31 Oct 2017 09:08:42 +0100 -Subject: [PATCH 3/3] Use user namespaces for FSETID policy check. +Subject: [PATCH 3/4] Use user namespaces for FSETID policy check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch b/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch new file mode 100644 index 0000000..4d76ece --- /dev/null +++ b/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch @@ -0,0 +1,33 @@ +From 98fdf1c88fd8c42eb1fa3e0df98d6f217b74b5f6 Mon Sep 17 00:00:00 2001 +From: Antonio Russo +Date: Mon, 18 Dec 2017 12:43:55 -0500 +Subject: [PATCH 4/4] Enable zfs-import.target in systemd preset (#6968) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Cherry picked line from PR #6822, this enables the new +target introduced in PR #6764. + +Signed-off-by: Antonio Russo +(cherry picked from commit da16fc5739b1962b3d357246938d2df06d6a1075) +Signed-off-by: Fabian Grünbichler +--- + etc/systemd/system/50-zfs.preset.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in +index 4d82778e3..884a69b5b 100644 +--- a/etc/systemd/system/50-zfs.preset.in ++++ b/etc/systemd/system/50-zfs.preset.in +@@ -1,6 +1,7 @@ + # ZFS is enabled by default + enable zfs-import-cache.service + disable zfs-import-scan.service ++enable zfs-import.target + enable zfs-mount.service + enable zfs-share.service + enable zfs-zed.service +-- +2.14.2 + diff --git a/zfs-patches/series b/zfs-patches/series index edbef43..54e9601 100644 --- a/zfs-patches/series +++ b/zfs-patches/series @@ -1,3 +1,4 @@ 0001-remove-DKMS-modules-and-dracut-build.patch 0002-import-with-d-dev-disk-by-id-in-scan-service.patch 0003-Use-user-namespaces-for-FSETID-policy-check.patch +0004-Enable-zfs-import.target-in-systemd-preset-6968.patch