avoid warnings inside initrd

diff --git a/Makefile b/Makefile
index 8f805468c1a8eef5341acbbd93a20aca46bd89d3..cd254e2cd9565ef2650628ce3b3fb8874ab4bb9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ RELEASE=3.3
 # source form https://github.com/zfsonlinux/
 
 ZFSVER=0.6.3-1.2
-PKGREL=1~wheezy
+PKGREL=2~wheezy
 PKGVER=0.6.3-${PKGREL}
 
 SPLDIR=spl-spl-${ZFSVER}

diff --git a/zfs-debian-pve/changelog b/zfs-debian-pve/changelog
index ab13bdea7225465213eb30654a53928fd4f14539..90f57fcc09f55d0cf80cc4a3efd7cf6efd49c786 100644 (file)
--- a/zfs-debian-pve/changelog
+++ b/zfs-debian-pve/changelog
@@ -1,3 +1,11 @@
+zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
+
+  * use /sbin/modprobe to avoid warning inside initrd
+
+  * fix warning about undefined values inside initrd
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
+
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
 
   * first version for Proxmox VE

diff --git a/zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs b/zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs
index 2ff7a553add9b22d74d962b4100c1239dbbfdfff..15804783b420e2ae3c966535f6e669251a334443 100644 (file)
--- a/zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs
+++ b/zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs
@@ -15,6 +15,7 @@ pre_mountroot()
 
        if [ -r '/etc/default/zfs' ]
        then
+               ZFS_INITRD_PRE_MOUNTROOT_SLEEP=0
                . '/etc/default/zfs'
                if [ "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP" -gt '0' ]
                then
@@ -47,7 +48,7 @@ mountroot()
        wait_for_udev
 
        # Load the module now to get consistent automatic pool import behavior.
-       modprobe zfs
+       /sbin/modprobe zfs
 
        # Check the kernel command line for overrides.
        ZFS_RPOOL="${rpool#rpool=}"