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

[Moritz Heiber]

Author: moe
Date: 2006-02-20 16:03:39 +0000 (Mon, 20 Feb 2006)
New Revision: 18799

Modified:
   moonbase/trunk/filesys/e2fsprogs/DETAILS
   moonbase/trunk/filesys/e2fsprogs/init.d/mount
Log:
Pushing this update as it is required for the new udev to run
properly.

* Removed the tmpfs line. Never knew why its been there actually
* Minor swap-stuff related adjustments (Added some *'s)
* The fd link is in fact created automaticly over here (or at
  least it stays there now as the tmpfs is gone). Implented
  a sligh if;then to check wether its already there
* We cannot sync again if neither /proc nor / are mounted
  (infact, sync doesn't make sense at all if / is mounted
   read-only!)

Prepare for an udev update too



Modified: moonbase/trunk/filesys/e2fsprogs/DETAILS
===================================================================
--- moonbase/trunk/filesys/e2fsprogs/DETAILS	2006-02-20 11:22:51 UTC (rev 18798)
+++ moonbase/trunk/filesys/e2fsprogs/DETAILS	2006-02-20 16:03:39 UTC (rev 18799)
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:aa8915fe43bc7cf5fba633df7041009ce9981551
         WEB_SITE=http://e2fsprogs.sourceforge.net
          ENTERED=20010922
-         UPDATED=20060215
+         UPDATED=20060220
            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-20 11:22:51 UTC (rev 18798)
+++ moonbase/trunk/filesys/e2fsprogs/init.d/mount	2006-02-20 16:03:39 UTC (rev 18799)
@@ -197,11 +197,12 @@
 		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 /dev" "mount -n -t tmpfs tmpfs /dev -o size=4m,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_without_msg "mkdir -p /dev/{pts,shm}"
-		run_without_msg "ln -sf /proc/self/fd /dev/fd"
+		if [ ! -h /dev/fd ]; then
+			ln -sf /proc/self/fd /dev/fd
+		fi
 	fi
 
 	# or do we want to explicitly _not_ fsck at all
@@ -234,7 +235,7 @@
 		fi
 	fi
 	
-	run_with_msg " * Remounting root read-write" "mount -n -o remount,rw /"
+	run_with_msg " * Remounting root read-write" "mount -o remount,rw /"
 	if [ "$FORCE" == "-f" ]; then
 		rm -f /forcefsck
 	fi
@@ -242,10 +243,9 @@
 	run_without_msg "echo -n \"\" > /etc/mtab"
 	run_without_msg "rm -f /etc/mtab~*"
 	# hack to get it into /etc/mtab
-	run_without_msg "mount -f -o remount,rw /"
+ 	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: "
 
 	# hack to get it into /etc/mtab
@@ -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
 
@@ -372,8 +372,6 @@
 			esac
 		fi
 	fi
-
-	run_without_msg "sync; sync" "2"
 }
 
 
@@ -389,4 +387,3 @@
 esac
 
 . /lib/lsb/init-functions
-