From: Fabian Grünbichler Date: Thu, 27 Jul 2017 11:14:06 +0000 (+0200) Subject: drop patches applied upstream X-Git-Tag: zfs-2.0.6-bullseye~205 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a59077893a09abe69b51ba86f06636241d04cd83;p=zfsonlinux.git drop patches applied upstream --- diff --git a/zfs-patches/0003-fix-rm-path-in-zfs-share.service.patch b/zfs-patches/0003-fix-rm-path-in-zfs-share.service.patch deleted file mode 100644 index 1d7414b..0000000 --- a/zfs-patches/0003-fix-rm-path-in-zfs-share.service.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b6507e2f68b8b57f2989833c39b3512ee53c51ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Thu, 27 Oct 2016 10:18:55 +0200 -Subject: [PATCH 3/3] fix rm path in zfs-share.service -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler ---- - etc/systemd/system/zfs-share.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in -index 688731e..494f5cb 100644 ---- a/etc/systemd/system/zfs-share.service.in -+++ b/etc/systemd/system/zfs-share.service.in -@@ -9,7 +9,7 @@ PartOf=smb.service - [Service] - Type=oneshot - RemainAfterExit=yes --ExecStartPre=-@bindir@/rm -f /etc/dfs/sharetab -+ExecStartPre=-/bin/rm -f /etc/dfs/sharetab - ExecStart=@sbindir@/zfs share -a - - [Install] --- -2.1.4 - diff --git a/zfs-patches/series b/zfs-patches/series index f69c75f..16efc00 100644 --- a/zfs-patches/series +++ b/zfs-patches/series @@ -1,3 +1,2 @@ 0001-remove-DKMS-modules-and-dracut-build.patch 0002-import-with-d-dev-disk-by-id-in-scan-service.patch -0003-fix-rm-path-in-zfs-share.service.patch