[Initng-svn] r2364 - initng/initfiles/system

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Dec  8 12:12:02 2005
New Revision: 2364

Modified:
   initng/initfiles/system/initial.ii
Log:
Dont depend on mountpoint.



Modified: initng/initfiles/system/initial.ii
==============================================================================
--- initng/initfiles/system/initial.ii	(original)
+++ initng/initfiles/system/initial.ii	Thu Dec  8 12:12:02 2005
@@ -6,20 +6,20 @@
 umask 022
 set -e
 
-if ! @mountpoint@ -q /proc
+if ! @cat@ /proc/self/mounts  | @awk@ '{ print $2 };' | @grep@ -q "^/proc$"
 then
     echo "Mounting proc at /proc ..."
     @mkdir@ -p /proc && mount -n -t proc none /proc &
 fi
 
-if ! @mountpoint@ -q /sys
+if ! @cat@ /proc/self/mounts  | @awk@ '{ print $2 };' | @grep@ -q "^/sys$"
 then
     echo "Mounting sysfs at /sys ..."
     @mkdir@ -p /sys && mount -n -t sysfs none /sys &
 fi
 
 # Ok, go create /dev
-if ! @mountpoint@ -q /dev
+if ! @cat@ /proc/self/mounts  | @awk@ '{ print $2 };' | @grep@ -q "^/dev$"
 then
     echo "Mounting ramfs at /dev ..."
     @mkdir@ -p /dev && mount -n -o size=10M,mode=0755 -t tmpfs tmpfs /dev && @mknod@ /dev/null c 1 3 -m 666 &
@@ -47,16 +47,16 @@
 umask 022
 set -e    
     
-if [ -e /lib/udev/devices ]
-then
+    if [ -e /lib/udev/devices ]
+    then
 
-    # Copy over default device tree
-    (cd /lib/udev/devices && find -print0 | cpio --quiet -0pmdu /dev)
+	# Copy over default device tree
+	(cd /lib/udev/devices && find -print0 | cpio --quiet -0pmdu /dev)
     
-    echo -n "Running @/sbin/udevplug@ .. :"
-    time @/sbin/udevplug@
-    echo "  done"
-else
+	echo -n "Running @/sbin/udevplug@ .. :"
+	time @/sbin/udevplug@
+	echo "  done"
+    else
 
     # Check for udevstart.
     if [ ! -e @/sbin/udevstart:/sbin/start_udev@ ]; then 
@@ -73,10 +73,13 @@
 	exit 1
     fi
 
-    # Create /dev/MAKEDEV
-    if [ -e @/sbin/MAKEDEV@ ]
+    if [ ! -e /dev/MAKEDEV ]
     then
-	@ln@ -fs @/sbin/MAKEDEV@ /dev/MAKEDEV
+	# Create /dev/MAKEDEV
+	if [ -e @/sbin/MAKEDEV@ ]
+	then
+	    @ln@ -fs @/sbin/MAKEDEV@ /dev/MAKEDEV
+	fi
     fi
 
 fi