[Lunar-commits] r18810 - in moonbase/trunk/filesys/e2fsprogs: . init.d

[Moritz Heiber]

Author: moe
Date: 2006-02-21 19:30:20 +0000 (Tue, 21 Feb 2006)
New Revision: 18810

Modified:
   moonbase/trunk/filesys/e2fsprogs/DETAILS
   moonbase/trunk/filesys/e2fsprogs/init.d/mount
Log:
Final version of the mount script.

* Made it 085 compatible
  - Starting udevd now
  - Properly inserting / in mtab
  - New mtab handling
  - Mount tmpfs again, Mode 0755, Size 6MB (Huge system may
    actually carry 6MB device nodes ;-)

Note: Without hal udev spits out a load of debug/error messages.
You may savely ignore those.



Modified: moonbase/trunk/filesys/e2fsprogs/DETAILS
===================================================================
--- moonbase/trunk/filesys/e2fsprogs/DETAILS	2006-02-21 19:28:24 UTC (rev 18809)
+++ moonbase/trunk/filesys/e2fsprogs/DETAILS	2006-02-21 19:30:20 UTC (rev 18810)
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:aa8915fe43bc7cf5fba633df7041009ce9981551
         WEB_SITE=http://e2fsprogs.sourceforge.net
          ENTERED=20010922
-         UPDATED=20060220
+         UPDATED=20060221
            SHORT="Utilities for the EXT2 file system."
 cat << EOF
 e2fsprogs - The EXT2 file system utilities and libraries.  EXT2 stands

Modified: moonbase/trunk/filesys/e2fsprogs/init.d/mount
===================================================================
--- moonbase/trunk/filesys/e2fsprogs/init.d/mount	2006-02-21 19:28:24 UTC (rev 18809)
+++ moonbase/trunk/filesys/e2fsprogs/init.d/mount	2006-02-21 19:30:20 UTC (rev 18810)
@@ -1,7 +1,6 @@
 #!/bin/bash
 #
 # mount - mount and umount filesystems
-#
 
 wait_some()
 {
@@ -197,8 +196,10 @@
 		run_with_msg " * Mounting /dev" "mount -n -t devfs devfs /dev"
 		run_with_msg "Starting devfsd" "devfsd /dev"
 	elif [ "$DEVNODES" = "udev" ]; then
+		run_with_msg " * Mounting tmpfs on /dev" "mount -t tmpfs tmpfs /dev -o size=6m,mode=0755"
 		run_with_msg "Setting /sbin/udevsend to manage hotplug events" "echo /sbin/udevsend > /proc/sys/kernel/hotplug"
 		run_with_msg "Creating udev device nodes on /dev" "/sbin/udevstart"
+                run_with_msg "Starting udev device handling daemon" "/sbin/udevd --daemon"
 		run_without_msg "mkdir -p /dev/{pts,shm}"
 		if [ ! -h /dev/fd ]; then
 			ln -sf /proc/self/fd /dev/fd
@@ -235,16 +236,15 @@
 		fi
 	fi
 	
-	run_with_msg " * Remounting root read-write" "mount -o remount,rw /"
+	run_with_msg " * Remounting root read-write" "mount -n -o remount,rw /"
 	if [ "$FORCE" == "-f" ]; then
 		rm -f /forcefsck
 	fi
 
-	run_without_msg "echo -n \"\" > /etc/mtab"
-	run_without_msg "rm -f /etc/mtab~*"
+	run_without_msg "> /etc/mtab"
 	# hack to get it into /etc/mtab
  	run_without_msg "mount -f -o remount,rw /"
-	run_with_msg  "* Turning on swap" "swapon -a &> /dev/null"
+	run_with_msg  "Turning on swap" "swapon -a"
 
 	echo "Mounting remaining filesystems: "
 
@@ -359,7 +359,7 @@
 	
 	done
 
-	run_with_msg "* Turning off swap" "swapoff -a"
+	run_with_msg "Turning off swap" "swapoff -a"
 
 	run_without_msg "sync; sync;" "2"  # might take some time so we wait here for a couple of seconds