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

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Dec  8 10:42:01 2005
New Revision: 2360

Modified:
   initng/initfiles/system/initial.ii
Log:
Morwork on system/initial/*



Modified: initng/initfiles/system/initial.ii
==============================================================================
--- initng/initfiles/system/initial.ii	(original)
+++ initng/initfiles/system/initial.ii	Thu Dec  8 10:42:01 2005
@@ -1,20 +1,29 @@
 
-service system/initial/mountproc {
+service system/initial/mountvirtfs {
     critical;
     script start = {
 
 umask 022
 set -e
-    
-echo "Mounting proc at /proc ..."
- at mkdir@ -p /proc && mount -n -t proc none /proc &
 
-echo "Mounting sysfs at /sys ..."
- at mkdir@ -p /sys && mount -n -t sysfs none /sys &
+if ! @mountpoint@ -q /proc
+then
+    echo "Mounting proc at /proc ..."
+    @mkdir@ -p /proc && mount -n -t proc none /proc &
+fi
+
+if ! @mountpoint@ -q /sys
+then
+    echo "Mounting sysfs at /sys ..."
+    @mkdir@ -p /sys && mount -n -t sysfs none /sys &
+fi
 
 # Ok, go create /dev
-echo "Mounting ramfs at /dev ..."
- at mkdir@ -p /dev && mount -n -o size=10M,mode=0755 -t tmpfs tmpfs /dev && @mknod@ /dev/null c 1 3 -m 666 &
+if ! @mountpoint@ -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 &
+fi
 
 # Make sure all mounts are finished.
 wait 
@@ -25,13 +34,13 @@
 
 # udevd to handle udev requests
 daemon system/initial/udevd {
-    need = system/initial/mountproc;
+    need = system/initial/mountvirtfs;
     exec daemon = @/sbin/udevd@;
 }
 
 # fill the /dev with all devices system have
 service system/initial/filldev {
-    need = system/initial/mountproc system/initial/udevd;
+    need = system/initial/mountvirtfs system/initial/udevd;
     critical;
     script start = {
 
@@ -116,7 +125,7 @@
 }
 
 service system/initial {
-    need = system/initial/mountproc system/initial/udevd system/initial/filldev;
+    need = system/initial/mountvirtfs system/initial/udevd system/initial/filldev;
     use = system/readahead;
     critical;
     script start = {