[Devil-linux-commit] build/config/etc/initrd linuxrc,1.70.2.12,1.70.2.13 mount_cdrom,1.25.2.14,1.25.2.15

[Friedrich L. <fr...@us...>]

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

Modified Files:
      Tag: rel-1-2-patches
	linuxrc mount_cdrom 
Log Message:
brush up the boot process


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.70.2.12
retrieving revision 1.70.2.13
diff -u -d -r1.70.2.12 -r1.70.2.13
--- linuxrc	25 May 2006 17:21:40 -0000	1.70.2.12
+++ linuxrc	28 May 2006 00:44:06 -0000	1.70.2.13
@@ -57,9 +57,11 @@
 	# $... = list of devices
 	FILE=$1
 	shift
+
+	echo "Searching for config file \"$FILE\""
 	for SRC in "$@"
 	do	
-		echo -n "Checking for \"$FILE\" on \"$SRC\" ... "
+		echo -n "  checking $SRC..."
 		if mount -n -t auto $SRC /floppy >/dev/null 2>&1  ; then
 			if [ -e /floppy/$FILE ] ; then
 				$GREEN
@@ -176,21 +178,22 @@
 
 # make sure all kernel warnings get lost (seriously!)
 klogd -c 1
+
+# print our current running kernel version
+echo Kernel $(uname -r)
+
 # give klogd some time to start
 sleep 1
 
 # mount proc
-mount -n -t proc none /proc
+mount -n -t proc proc /proc
 
 # mount usb
-mount -n -t usbdevfs none /proc/bus/usb
-
-# print our current running kernel version
-echo Kernel $(uname -r)
+mount -n -t usbdevfs usbdevfs /proc/bus/usb
 
 # mount shared memory filesystem with the default limit of ram-memory/2
 echo "Mounting SHM FS on /shm"
-mount -n -t shm shmfs /shm 2> /dev/null || mount -n -t tmpfs none /shm
+mount -n -o size=20m -t shm shmfs /shm 2> /dev/null || mount -n -t tmpfs none /shm
 
 # get rid of modprobe warnings
 mkdir -p /shm/etc
@@ -298,7 +301,7 @@
 
 mkdir -p /shm/root
 
-echo "loading configuration"
+echo "Loading configuration"
 if [ "$REALLY_LIVE" = "1" ] ; then
     # check to see if cdrom has already been mounted
     if [ ! -e /cdrom/DEVIL-LINUX ] ; then
@@ -372,17 +375,19 @@
 kill `ps | grep klogd | grep -v grep | awk '{ print $1 }'`
 
 # mount shared memory filesystem
-echo "Mounting SHM FS on /cdrom/shm"
-mount -n -o bind /shm /cdrom/shm
-umount /shm
+echo "Moving SHM FS to /cdrom/shm"
+mount -n -o move /shm /cdrom/shm
 
 echo "Mounting DEV FS on /cdrom/dev"
-mount -n -t devfs none /cdrom/dev
+mount -n -t devfs devfs /cdrom/dev
 
 # unmount usb
+echo -n "Unmounting "
+$GREEN; echo -n " usbdevfs"; $NORMAL
 umount /proc/bus/usb
 
 # unmount proc because the final system will mount it again
+$GREEN; echo " proc"; $NORMAL
 umount /proc
 
 # start the system by swapping /dev/ram0 and /shm
@@ -391,6 +396,7 @@
 
 #change to new root and start up the real system
 pivot_root . initrd
+cd / # see "man 2 pivot_root"
 exec /usr/sbin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
 
 # something went wrong

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25.2.14
retrieving revision 1.25.2.15
diff -u -d -r1.25.2.14 -r1.25.2.15
--- mount_cdrom	16 May 2006 03:16:11 -0000	1.25.2.14
+++ mount_cdrom	28 May 2006 00:44:06 -0000	1.25.2.15
@@ -60,7 +60,7 @@
 
 for disk in $CDROMS
 do
-	echo -n "checking $disk..."
+	echo -n "  checking $disk..."
 	if mount -n -t iso9660 -o ro $disk ${mountpoint} 2> /dev/null; then
 		if [ -e ${mountpoint}/DEVIL-LINUX ] ; then
 			if [ !  $silent ]; then
@@ -96,7 +96,7 @@
 
 for disk in $PARTITIONS
 do
-	echo -n "checking $disk "
+	echo -n "  checking $disk "
 	if mount -n -t auto -o rw,noatime $disk /mnt 2> /dev/null; then
 		if [ -e /mnt/DEVIL-LINUX ] ; then
 			$GREEN