ignore zfs-import-scan errors

zpool import return error if we have no zfs pools. We want to ignore that.

diff --git a/Makefile b/Makefile
index bced982aaf38ca636627568a2361624cf3426aa9..9c18682aee7bdc315f4a6dabac3cb135a379d4ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ RELEASE=4.0
 # source form https://github.com/zfsonlinux/
 
 ZFSVER=0.6.3-1.2
-ZFSPKGREL=pve2~jessie
+ZFSPKGREL=pve3~jessie
 SPLPKGREL=pve1~jessie
 ZFSPKGVER=0.6.3-${ZFSPKGREL}
 SPLPKGVER=0.6.3-${SPLPKGREL}

diff --git a/zfs-debian-pve/changelog b/zfs-debian-pve/changelog
index 033dc689833f2027e070e161830c377dbc1416f7..60b160b846c64a069179e119c97f882727a3b758 100644 (file)
--- a/zfs-debian-pve/changelog
+++ b/zfs-debian-pve/changelog
@@ -1,3 +1,9 @@
+zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
+
+  * ignore zfs-import-scan errors
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
+
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
 
   * use systemd for service startup

diff --git a/zfs-debian-pve/patches/ignore-zfs-import-error.patch b/zfs-debian-pve/patches/ignore-zfs-import-error.patch
new file mode 100644 (file)
index 0000000..04003ce
--- /dev/null
+++ b/zfs-debian-pve/patches/ignore-zfs-import-error.patch
@@ -0,0 +1,10 @@
+Index: new/etc/systemd/system/zfs-import-scan.service.in
+===================================================================
+--- new.orig/etc/systemd/system/zfs-import-scan.service.in
++++ new/etc/systemd/system/zfs-import-scan.service.in
+@@ -8,4 +8,4 @@ ConditionPathExists=!@sysconfdir@/zfs/zp
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@sbindir@/zpool import -d /dev/disk/by-id -aN
++ExecStart=-@sbindir@/zpool import -d /dev/disk/by-id -aN

diff --git a/zfs-debian-pve/patches/series b/zfs-debian-pve/patches/series
index 56e1bdcb586a3cd59b35fc14b8ecb7f7f2826363..cfb432edfb154b00d552b1b63e64e52c5ed9cf2c 100644 (file)
--- a/zfs-debian-pve/patches/series
+++ b/zfs-debian-pve/patches/series
@@ -2,3 +2,4 @@
 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
 0005-vdev_id-use-mawk-compatible-regular-expression.patch
+ignore-zfs-import-error.patch