From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 17 Oct 2006 22:46:48 +0000 (+0000)
Subject: $UDEV_TMPFS dropped, $tmpfs_dev indicates that /dev is with tmpfs.
X-Git-Tag: 8360~73
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=b4d9d3847bb321992b5426b130e3db14b0a12f57;p=projects%2Fgeninitrd.git

$UDEV_TMPFS dropped, $tmpfs_dev indicates that /dev is with tmpfs.

svn-id: @7864
---

diff --git a/geninitrd b/geninitrd
index 1a5ad8a..e36f720 100755
--- a/geninitrd
+++ b/geninitrd
@@ -42,9 +42,11 @@ rootdev_nr=0
 # default bootsplash is off, if it have to be on, install bootsplash package
 BOOT_SPLASH=no
 
+# is /dev on tmpfs. internal variable
+tmpfs_dev=
+
 if [ -f /etc/udev/udev.conf -a -x /sbin/initrd-udev ]; then
 	USE_UDEV="yes"
-	UDEV_TMPFS="yes"
 	. /etc/udev/udev.conf
 fi
 
@@ -909,7 +911,6 @@ if [ "$pack_version" -lt "002006" ] ; then
 	USE_UDEV=
 	USE_DMRAID=
 fi
-[ -z "$USE_UDEV" ] && UDEV_TMPFS=
 
 if [ "$pack_version" -ge "002005" ] ; then
 	modext=".ko"
@@ -1140,6 +1141,19 @@ umount /proc
 EOF
 }
 
+initrd_gen_tmpfs_dev() {
+	tmpfs_dev=yes
+	cat <<-EOF
+: 'Creating /dev'
+mount -o mode=0755 -t tmpfs none /dev
+mknod /dev/console c 5 1
+mknod /dev/null c 1 3
+mknod /dev/zero c 1 5
+mkdir /dev/pts
+mkdir /dev/shm
+EOF
+}
+
 initrd_gen_udev() {
 	[ -n "$verbose" ] && echo "Setting up udev..."
 	mkdir -p $MNTIMAGE/sbin
@@ -1154,17 +1168,7 @@ initrd_gen_udev() {
 	ln -s udev $MNTIMAGE/sbin/hotplug
 
 	if is_yes "$USE_UDEV"; then
-		if is_yes "$UDEV_TMPFS"; then
-			cat >> "$s" <<-EOF
-: 'Creating /dev'
-mount -o mode=0755 -t tmpfs none /dev
-mknod /dev/console c 5 1
-mknod /dev/null c 1 3
-mknod /dev/zero c 1 5
-mkdir /dev/pts
-mkdir /dev/shm
-EOF
-		fi
+		initrd_gen_tmpfs_dev >> "$s"
 		cat >> "$s" <<-EOF
 mount -t proc none /proc
 mount -t sys none /sys
@@ -1317,7 +1321,7 @@ initrd_gen_lvm() {
 	mkdir -p $MNTIMAGE/tmp
 	mkdir -p $MNTIMAGE/proc
 	mkdir -p $MNTIMAGE/newroot
-	if ! is_yes "$USE_UDEV"; then
+	if ! is_yes "$tmpfs_dev"; then
 		mkdir -p $MNTIMAGE/dev/mapper
 		mknod $MNTIMAGE/dev/mapper/control c 10 63
 		for device in $PVDEVICES; do