[Devil-linux-commit] build/scripts/scripts pre_init, 1.19.2.7, 1.19.2.8

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv32276/scripts/scripts

Modified Files:
      Tag: rel-1-2-patches
	pre_init 
Log Message:
- updated busybox to v1.2.1
- if the boot device is not a CD, the mount point of it is moved to
  /var/adm/boot , because a mount of the device is not possible anymore.
  execute: mount -o remount,rw /var/adm/boot
  in order to make changes


Index: pre_init
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/pre_init,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -d -r1.19.2.7 -r1.19.2.8
--- pre_init	9 Oct 2006 14:20:02 -0000	1.19.2.7
+++ pre_init	23 Oct 2006 21:27:43 -0000	1.19.2.8
@@ -33,10 +33,16 @@
 echo "Un-Mounting old Filesystems"
 umount /initrd/dev &> /dev/null
 umount /initrd/floppy &> /dev/null
-# if boot was from ISO image file on disk, this next umount won't succeed.
-# Use -l (lazy) to disconnect it from filesystem while preserving existing use,
-# and clean up when possible to truly unmount it, ie after ISO is unmounted. (Does this happen?)
-umount /initrd -l&> /dev/null
+if [ -f /initrd/cd/bootcd.iso ]; then
+    # move the mountpoint of initrd/cd to /var/adm/boot
+    # this will allow the administrator to install updates later
+    mkdir -p /shm/var/adm/boot
+    mount --move -o ro /initrd/cd /shm/var/adm/boot
+fi
+# umount the initrd
+# this won't completely umount, because the loop device is still using it
+# that's why we use the lazy option
+umount /initrd -l &> /dev/null
 
 echo "Initializing devfs"
 /sbin/devfsd /dev