slitaz-modular rev 25

Update initramfs init script.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Feb 22 10:50:13 2011 +0000 (2011-02-22)
parents 7071725cd1cc
children 8f8af6b88207
files initramfs/init
line diff
     1.1 --- a/initramfs/init	Thu Feb 03 11:55:16 2011 +0000
     1.2 +++ b/initramfs/init	Tue Feb 22 10:50:13 2011 +0000
     1.3 @@ -2,19 +2,22 @@
     1.4  
     1.5  launch_init()
     1.6  {
     1.7 -	umount /proc
     1.8 +	[ -d /proc/sys ] && umount /proc
     1.9  	echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]"
    1.10  	exec /sbin/switch_root mnt /sbin/init
    1.11  }
    1.12  
    1.13  launch_init_modular()
    1.14  {
    1.15 +	[ -d /proc/sys ] && umount /proc
    1.16  	echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]"
    1.17  	[ -d /mnt/initramfs ] || mkdir -p /mnt/initramfs
    1.18  	SYS_DIR="dev bin etc boot lib sbin home root usr var"
    1.19  	for dir in $SYS_DIR; do
    1.20  		cp -a /$dir /mnt/initramfs
    1.21  	done
    1.22 +	[ -f /mnt/dev/sdc ] || mknod /mnt/dev/sdc b 8 32
    1.23 +	[ -f /mnt/dev/sdc1 ] || mknod /mnt/dev/sdc1 b 8 33
    1.24  	MK_DIR="sys proc tmp media mnt"
    1.25  	for dir1 in $MK_DIR; do
    1.26  		mkdir -p /mnt/initramfs/$dir1
    1.27 @@ -24,7 +27,7 @@
    1.28  
    1.29  failed()
    1.30  {
    1.31 -	umount /proc
    1.32 +	[ -d /proc/sys ] && umount /proc
    1.33  	echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]"
    1.34  }
    1.35  
    1.36 @@ -156,7 +159,6 @@
    1.37  [ -n "$size" ] || size="-o size=90%"
    1.38  if [ $free -lt 100 ] || ! mount -t tmpfs $size tmpfs /mnt; then
    1.39  	echo -e "\\033[70G[ \\033[1;33mSkipped\\033[0;39m]"
    1.40 -	umount /proc
    1.41  	exec /sbin/init
    1.42  fi
    1.43  for i in $(ls -a /); do