Small cleanups in unionfs code

diff --git a/ChangeLog b/ChangeLog
index 3564ec1650a31d9420c72652b18a6cf54d82f923..0f2468df275bde425fabe91aa0e5a924059b5ff6 100644 (file)
--- 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 a73b642f54f4662ab9ffa385c1aed68aeb62b7c9..d333767021dfc773ff4adccafdbe9d1ddb6f2c49 100644 (file)
--- 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 c38c9070d41c43baa8a73c5ce5b32ac1a717b1ac..49a476de9f012e94b7717287f7c6223673ca65dc 100644 (file)
--- 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