[SCM] live-initramfs branch, master, updated. debian/1.177.1-1-1-gbcf8114

Daniel Baumann daniel at debian.org
Tue Mar 23 16:48:43 UTC 2010


The following commit has been merged in the master branch:
commit bcf811457b38f65e1737cd8f3c64eaa9505e44f8
Author: Marco Amadori <amadorim at vdavda.com>
Date:   Tue Mar 23 15:44:00 2010 +0100

    Do not specify 'noxino' between directories.

diff --git a/scripts/live b/scripts/live
index 0fb6adf..d05080d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1119,7 +1119,8 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr,noxino"
+		roopt="rr"
+		noxino_opt="noxino,"
 	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
 	then
 		roopt="RO"
@@ -1380,7 +1381,7 @@ setup_unionfs ()
 				;;
 
 			*)
-				mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+				mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}"
 				;;
 		esac
 	fi

-- 
live-initramfs



More information about the debian-live-changes mailing list