packages: udev/start_udev - add tmpfs compatibility for older kernels

baggins baggins at pld-linux.org
Sat Mar 3 10:28:31 CET 2012


Author: baggins                      Date: Sat Mar  3 09:28:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add tmpfs compatibility for older kernels

---- Files affected:
packages/udev:
   start_udev (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/udev/start_udev
diff -u packages/udev/start_udev:1.41 packages/udev/start_udev:1.42
--- packages/udev/start_udev:1.41	Fri Mar  2 23:42:19 2012
+++ packages/udev/start_udev	Sat Mar  3 10:28:26 2012
@@ -68,8 +68,8 @@
 show "Starting udev"
 busy
 
-# mount the devtmpfs on ${udev_root%/}, if not already done
-LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"devtmpfs\" { exit 1 }" /proc/mounts && {
+# mount the devtmpfs (tmpfs on older kernels) on ${udev_root%/}, if not already done
+LANG=C awk "\$2 == \"${udev_root%/}\" && ( \$3 == \"tmpfs\" || \$3 == \"devtmpfs\" ) { 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"
@@ -78,7 +78,11 @@
 		SHMDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
 		mount --move $udev_root/shm "$SHMDIR"
 	fi
-	mount -n -o mode=0755 -t devtmpfs devtmpfs "$udev_root"
+	if grep -qs devtmpfs /proc/filesystems; then
+		mount -n -o mode=0755 -t devtmpfs devtmpfs "$udev_root"
+	else
+		mount -n -o mode=0755 -t tmpfs none "$udev_root"
+	fi
 	mkdir -m 0755 $udev_root/pts
 	mkdir -m 0755 $udev_root/shm
 	if [ -n "$PTSDIR" ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/start_udev?r1=1.41&r2=1.42&f=u



More information about the pld-cvs-commit mailing list