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

[svn at initng.thinktux.net]

Author: deac
Date: Fri Dec  9 01:03:32 2005
New Revision: 2370

Modified:
   initng/initfiles/system/initial.ii
Log:
initfiles/system/initial.ii: totally broken! now first /etc/mtab will be deleted, then /proc, /sys, /dev will be - all - mounted. ugly but it works at the moment.

Modified: initng/initfiles/system/initial.ii
==============================================================================
--- initng/initfiles/system/initial.ii	(original)
+++ initng/initfiles/system/initial.ii	Fri Dec  9 01:03:32 2005
@@ -4,25 +4,22 @@
     script start = {
 		umask 022
 		set -e
+		@rm@ /etc/mtab
+		@touch@ /etc/mtab
 
-		if awk '{ gsub( /\/+/, "/"); } $2 ~ /\/sys\/?/ { ret = 1 ; exit } END { exit ret }' < /proc/mounts
-		then
-			echo "Mounting proc at /proc ..."
-			@mkdir@ -p /proc && mount -n -t proc none /proc &
-		fi
+		# why no asking like in prev rev? => it was very broken.
+		#   if the user reset his computer, the /etc/mtab is wrong.
+		#   we deleted it above. an asking isn't needed.
+		#   mountpoint was tested, but this exists only on debian.
+		#   i don't know how it works. it doesn't use mtab or /proc/*/mounts.
+		echo "Mounting proc at /proc ..."
+		@mkdir@ -p /proc && mount -n -t proc none /proc &
 
-		if awk '{ gsub( /\/+/, "/"); } $2 ~ /\/sys\/?/ { ret = 1 ; exit } END { exit ret }' < /proc/mounts
-		then
-			echo "Mounting sysfs at /sys ..."
-			@mkdir@ -p /sys && mount -n -t sysfs none /sys &
-		fi
+		echo "Mounting sysfs at /sys ..."
+		@mkdir@ -p /sys && mount -n -t sysfs none /sys &
 
-		# Ok, go create /dev
-		if awk '{ gsub( /\/+/, "/"); } $2 ~ /\/sys\/?/ { ret = 1 ; exit } END { exit ret }' < /proc/mounts
-		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
+		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 &
 
 		# Make sure all mounts are finished.
 		wait 
@@ -143,9 +140,9 @@
 		# logs, and that with dmesg can be used to check for problems
 		@/bin/dmesg@ -n 1 &
 
-		#ifd fedora
+#ifd fedora
 		@/sbin/setsysfont@
-		#endd
+#endd
 
 		# Setup hotplugging (if possible)
 		if [ -e /proc/sys/kernel/hotplug ]