c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid warnings inside initrd

Browse Source
This commit is contained in:
Dietmar Maurer 2015-01-14 19:07:21 +01:00
parent 6a193c585a
commit 2870e28ec9
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@ RELEASE=3.3
# source form https://github.com/zfsonlinux/ # source form https://github.com/zfsonlinux/
ZFSVER=0.6.3-1.2 ZFSVER=0.6.3-1.2
PKGREL=1~wheezy PKGREL=2~wheezy
PKGVER=0.6.3-${PKGREL} PKGVER=0.6.3-${PKGREL}
SPLDIR=spl-spl-${ZFSVER} SPLDIR=spl-spl-${ZFSVER}

8
zfs-debian-pve/changelog
View File

@ -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 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
* first version for Proxmox VE * first version for Proxmox VE

3
zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs
View File

@ -15,6 +15,7 @@ pre_mountroot()
if [ -r '/etc/default/zfs' ] if [ -r '/etc/default/zfs' ]
then then
ZFS_INITRD_PRE_MOUNTROOT_SLEEP=0
. '/etc/default/zfs' . '/etc/default/zfs'
if [ "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP" -gt '0' ] if [ "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP" -gt '0' ]
then then
@ -47,7 +48,7 @@ mountroot()
wait_for_udev wait_for_udev
# Load the module now to get consistent automatic pool import behavior. # Load the module now to get consistent automatic pool import behavior.
modprobe zfs /sbin/modprobe zfs
# Check the kernel command line for overrides. # Check the kernel command line for overrides.
ZFS_RPOOL="${rpool#rpool=}" ZFS_RPOOL="${rpool#rpool=}"