SOURCES (AC-branch): start_udev - use /initrd/dev if we find it mo...

glen glen at pld-linux.org
Thu Nov 1 03:45:44 CET 2007


Author: glen                         Date: Thu Nov  1 02:45:44 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- use /initrd/dev if we find it mounted as base for /dev

---- Files affected:
SOURCES:
   start_udev (1.8.2.5 -> 1.8.2.6) 

---- Diffs:

================================================================
Index: SOURCES/start_udev
diff -u SOURCES/start_udev:1.8.2.5 SOURCES/start_udev:1.8.2.6
--- SOURCES/start_udev:1.8.2.5	Wed Jul  5 18:14:44 2006
+++ SOURCES/start_udev	Thu Nov  1 03:45:39 2007
@@ -71,7 +71,7 @@
 busy
 
 # mount the tmpfs on ${udev_root%/}, if not already done
-LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+awk -vudev_root="${udev_root%/}" '$2 == udev_root && $3 == "tmpfs" { exit 1 }' /proc/mounts && {
 	if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
 		PTSDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
 		mount --move $udev_root/pts "$PTSDIR"
@@ -80,9 +80,16 @@
 		SHMDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
 		mount --move $udev_root/shm "$SHMDIR"
 	fi
-	mount -n -o mode=0755 -t tmpfs none "$udev_root"
-	mkdir -m 0755 $udev_root/pts
-	mkdir -m 0755 $udev_root/shm
+
+	# try to use /initrd/dev if it is there
+	if awk '$2 == "/initrd/dev" && $3 == "tmpfs" { exit 1 }' /proc/mounts; then
+		mount -n -o mode=0755 -t tmpfs none "$udev_root"
+	else
+		mount -n --move /initrd/dev "$udev_root"
+	fi
+
+	mkdir -p -m 0755 $udev_root/pts
+	mkdir -p -m 0755 $udev_root/shm
 	if [ -n "$PTSDIR" ]; then
 		mount --move "$PTSDIR" $udev_root/pts
 		rmdir "$PTSDIR"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/start_udev?r1=1.8.2.5&r2=1.8.2.6&f=u



More information about the pld-cvs-commit mailing list