[Devil-linux-commit] build/config/etc/initrd linuxrc, 1.98, 1.99 load_modules, 1.5, 1.6

[Bruce S. <bl...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16884/config/etc/initrd

Modified Files:
	linuxrc load_modules 
Log Message:
/etc is now "aufs"!


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- linuxrc	7 Nov 2007 14:31:42 -0000	1.98
+++ linuxrc	16 Apr 2008 13:19:15 -0000	1.99
@@ -65,6 +65,17 @@
 				DL_CONFIG_SOURCE=$SRC
 				DL_CONFIG_FILE=$FILE
 				return 0
+			elif [ -e /floppy/etc.tar.bz2 ] ; then
+				$YELLOW
+				echo "Pre-UnionFS config file found"
+				$NORMAL
+				REALLY_LIVE=1
+				DL_CONFIG_SOURCE=$SRC
+				DL_CONFIG_FILE="etc-mods.tar.bz2"
+				mkdir /shm/oldconfig
+				tar -xjpf /floppy/etc.tar.bz2 -C /shm/oldconfig
+				export REALLY_LIVE 
+				return 0
 			else
 				$YELLOW
 				echo "file not found"
@@ -194,7 +205,7 @@
 mount -n -o remount,rw /
 
 # get rid of modprobe and udevd warnings 
-mkdir -p /shm/etc
+mkdir -p /shm/etc /shm/etc-mods
 
 echo "waiting until usb-storage driver has initialized all devices ..."
 sleep 10
@@ -227,7 +238,7 @@
 DISCS_SCSI=`find /dev -name "sd*" 2> /dev/null`
 FLOPPIES=`find /dev -name "fd*" 2> /dev/null`
 CONFIG_SRC_LIST="$DISCS_SCSI $DEVICES_IDE $CDROM_SCSI $FLOPPIES"
-CONFIG_FILE="etc.tar.bz2"
+CONFIG_FILE="etc-mods.tar.bz2"
 
 CDROMS=$(grep -i "drive name" /proc/sys/dev/cdrom/info)
 
@@ -239,7 +250,7 @@
 		parse_config_cmdline $CONFIG_USER && continue
 	fi
 	if [ "$CONFIG_USER_ONLY" = "0" ]; then
-		# scan for etc.tar.bz2 on all devices
+		# scan for config file on all devices
 		scan_devices_for_config $CONFIG_FILE $CONFIG_SRC_LIST && continue
 	fi
 
@@ -269,11 +280,11 @@
 						continue
 					fi
 					mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 || continue
-					cp -i /cdrom/config/etc.tar.bz2 /floppy/ || continue
+					cp -i /cdrom/config/etc-mods.tar.bz2 /floppy/ || continue
 					umount /cdrom
 					sync
 					DL_CONFIG_SOURCE=$CFG_SRC
-					DL_CONFIG_FILE="etc.tar.bz2"
+					DL_CONFIG_FILE="etc-mods.tar.bz2"
 					continue 2
 				fi
 			fi
@@ -287,7 +298,7 @@
 	if ask_yes_no ; then
 	    REALLY_LIVE=1
 	    DL_CONFIG_SOURCE=/dev/null
-	    DL_CONFIG_FILE="etc.tar.bz2"
+	    DL_CONFIG_FILE="etc-mods.tar.bz2"
 	    export REALLY_LIVE 
 	    continue 2
 	else
@@ -303,7 +314,11 @@
 export DL_CONFIG_SOURCE
 export DL_CONFIG_FILE
 
-mkdir -p /shm/root
+if [ -d /shm/oldconfig/root ]; then
+	mv /shm/oldconfig/root /shm/root
+else
+	mkdir -p /shm/root
+fi
 
 # check if the DL ISO got upgraded
 if [ -e /shm/dl_iso_replaced ]; then
@@ -325,7 +340,7 @@
         # find the CDROM
         /mount_cdrom /cdrom
     fi
-    tar -C /shm -xjf /cdrom/config/etc.tar.bz2
+    tar -C /shm -xjf /cdrom/config/etc-mods.tar.bz2
     #
     # we unmount here to be able to possibly activate run from ram
     # if that's activated by the default config
@@ -439,4 +454,3 @@
 echo 'Please mail a bug report to bu...@de...'
 echo
 exit
-

Index: load_modules
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/load_modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- load_modules	1 Aug 2003 19:45:34 -0000	1.5
+++ load_modules	16 Apr 2008 13:19:15 -0000	1.6
@@ -7,7 +7,7 @@
 # http://www.devil-linux.org
 #
 
-. /etc/sysconfig/config
+. /shm/etc-mods/sysconfig/config
 
 for MODULE in $INITRD_MODULES
 do