[SCM] live-initramfs branch, master, updated. debian/1.173.1-1-3-gddddc3b
Daniel Baumann
daniel at debian.org
Fri Feb 19 14:31:29 UTC 2010
The following commit has been merged in the master branch:
commit ddddc3b5bfd6d6d1fbe4141e357fb762bbcfca87
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Feb 19 15:27:28 2010 +0100
Removing unionfs workaround for kernel versions << 2.6.22, not usefull anymore.
diff --git a/scripts/live b/scripts/live
index 26cd5cf..9479f3f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1101,13 +1101,8 @@ setup_unionfs ()
# Let's just mount the read-only file systems first
rofsstring=""
rofslist=""
- minor_kernel_version=$(uname -r|cut -c 5-|sed 's/[^0-9].*//')
- if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ]
- then
- # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
- roopt="nfsro"
- elif [ "${UNIONTYPE}" = "aufs" ]
+ if [ "${UNIONTYPE}" = "aufs" ]
then
roopt="rr"
else
--
live-initramfs
More information about the debian-live-changes
mailing list