From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 14 Nov 2008 03:46:12 +0000 (-0600)
Subject: Small cleanups in unionfs code
X-Git-Tag: v3.4.10.902~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abf5986e2ba1c4cdddb07a5b21c770ba9a082544;p=genkernel.git

Small cleanups in unionfs code
---

diff --git a/ChangeLog b/ChangeLog
index 3564ec1..0f2468d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Small cleanups in unionfs code
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/modules_load,
   arch/ia64/modules_load, arch/mips/modules_load, arch/parisc/modules_load,
   arch/parisc64/modules_load, arch/ppc/modules_load,
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a73b642..d333767 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -969,15 +969,15 @@ setup_unionfs() {
 	then
 		# Directory used for rw changes in union mount filesystem
 		UNION=/union
-		MEMORY=/memory
-		if [ -z "$UID" ]
-		then
-			CHANGES=$MEMORY/unionfs_changes/default
-		else
-			CHANGES=$MEMORY/unionfs_changes/$UID
-		fi
+#		MEMORY=/memory
+#		if [ -z "$UID" ]
+#		then
+#			CHANGES=$MEMORY/unionfs_changes/default
+#		else
+#			CHANGES=$MEMORY/unionfs_changes/$UID
+#		fi
 
-		mkdir -p ${MEMORY}
+#		mkdir -p ${MEMORY}
 		mkdir -p ${UNION}
 		good_msg "Loading fuse module"
 		modprobe fuse > /dev/null 2>&1
@@ -1009,9 +1009,9 @@ setup_unionfs() {
   	 
 		mkdir /tmp
 		mkdir -p ${UNION}
-		mkdir -p $CHANGES
+#		mkdir -p $CHANGES
 #		mount -t unionfs -o dirs=$CHANGES=rw unionfs ${UNION}
-		unionfs -o allow_other,cow,noinitgroups,suid,dev ${rw_dir}=RW:${ro_dir} ${UNION}
+		unionfs -o allow_other,cow,noinitgroups,suid,dev ${rw_dir}=RW:${ro_dir}=RO ${UNION}
 		ret=$?
 		if [ "${ret}" -ne 0 ]
 		then
diff --git a/defaults/linuxrc b/defaults/linuxrc
index c38c907..49a476d 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -193,10 +193,10 @@ do
 			fi
 			;;
 #                 unionfs\=*) 	 
-#                         if [ ! -x /sbin/unionctl ] 	 
+#                         if [ ! -x /sbin/unionfs ] 	 
 #                         then 	 
 #                                 USE_UNIONFS_NORMAL=0 	 
-#                                 bad_msg 'Unionctl not found: aborting use of unionfs!' 	 
+#                                 bad_msg 'unionfs binary not found: aborting use of unionfs!'
 #                         else 	 
 #                                 USE_UNIONFS_NORMAL=1 	 
 #                                 CMD_UNIONFS=`parse_opt "${x}"` 	 
@@ -285,7 +285,7 @@ rundebugshell
 if [ "${CDROOT}" = '1' ]
 then
 	good_msg "Making tmpfs for ${NEW_ROOT}"
-	mount -t tmpfs tmpfs "${NEW_ROOT}"
+	mount -n -t tmpfs tmpfs "${NEW_ROOT}"
 	
 	for i in dev mnt mnt/cdrom mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
 	do