From 42fb5e07e908b84498f370eb194eee7559b0968a Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 12 Jun 2005 08:32:23 +0000
Subject: Changes to fix population of the /dev directory in a turnup system on
 first boot.

BKrev: 42abf317-VPTABChzjck-YWWY6OEdA
---
 .../initscripts/initscripts-1.0/openslug/banner    |  0
 .../initscripts-1.0/openslug/devices.patch         | 52 ++++++++++++++++++++++
 packages/initscripts/initscripts-openslug_1.0.bb   |  3 ++
 3 files changed, 55 insertions(+)
 create mode 100644 packages/initscripts/initscripts-1.0/openslug/banner

(limited to 'packages/initscripts')

diff --git a/packages/initscripts/initscripts-1.0/openslug/banner b/packages/initscripts/initscripts-1.0/openslug/banner
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/initscripts/initscripts-1.0/openslug/devices.patch b/packages/initscripts/initscripts-1.0/openslug/devices.patch
index e69de29bb2..26b1841d5b 100644
--- a/packages/initscripts/initscripts-1.0/openslug/devices.patch
+++ b/packages/initscripts/initscripts-1.0/openslug/devices.patch
@@ -0,0 +1,52 @@
+#
+# Patch to allow /dev to reside permanently in the file
+# system.
+#
+--- old/devices	2005-05-28 21:51:39.012078699 -0700
++++ new/devices	2005-06-12 00:16:29.222686303 -0700
+@@ -6,7 +6,7 @@
+ . /etc/default/rcS
+ 
+ # exit without doing anything if udev is active
+-if test -e /dev/.udevdb; then
++if test -e /dev/.udevdb -o -e /dev/.permanent; then
+ 	exit 0
+ fi
+ 
+@@ -37,12 +37,20 @@
+ 	mknod /dev/ppp c 108 0
+ 	if test "$VERBOSE" != "no"; then echo "done"; fi
+ else
+-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+-	if test $? -ne 0; then
+-		if test "$VERBOSE" != "no"; then echo "failed"; fi
++	if test -e /dev/.noram
++	then
++		# There should be no files, any files will damage the
++		# makedevs script below.
++		rm $(find /dev -type f -print)
++		:>/dev/.noram
+ 	else
+-		if test "$VERBOSE" != "no"; then echo "done"; fi
++		if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
++		mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
++		if test $? -ne 0; then
++			if test "$VERBOSE" != "no"; then echo "failed"; fi
++		else
++			if test "$VERBOSE" != "no"; then echo "done"; fi
++		fi
+ 	fi
+ 	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+ 	cd /
+@@ -60,6 +68,10 @@
+ 		if test "$VERBOSE" != "no"; then echo "failed"; fi
+ 	else
+ 		if test "$VERBOSE" != "no"; then echo "done"; fi
++		if test -e /dev/.noram
++		then
++			:>/dev/.permanent
++		fi
+ 	fi
+ fi
+ 
diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb
index aaff5bc2c5..ba8d548b6e 100644
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-openslug_1.0.bb
@@ -9,6 +9,9 @@ include initscripts_${PV}.bb
 MAINTAINER = "John Bowler <jbowler@acm.org>"
 RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
+# Except the PR which is hacked here.  The format used is
+# a suffix
+PR := "${PR}.1"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-- 
cgit v1.2.3