[d-i-commits] r32183 - in trunk/packages/rootskel: debian src/lib/debian-installer-startup.d

[Colin Watson]

Author: cjwatson
Date: 2005-11-16 20:51:53 +0000 (Wed, 16 Nov 2005)
New Revision: 32183

Added:
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev-fixup
Removed:
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev
Modified:
   trunk/packages/rootskel/debian/changelog
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/Makefile
Log:
* Drop S02udev startup script (provided by udev-udeb) and ship
  S02udev-fixup instead to arrange for /.dev to be mounted for programs
  that still care.

Modified: trunk/packages/rootskel/debian/changelog
===================================================================
--- trunk/packages/rootskel/debian/changelog	2005-11-16 20:38:49 UTC (rev 32182)
+++ trunk/packages/rootskel/debian/changelog	2005-11-16 20:51:53 UTC (rev 32183)
@@ -13,6 +13,9 @@
     things; udevstart has gone away.
   * If udevstart is missing, try udevsynthesize instead to attempt to
     encourage udev to settle after loading framebuffer modules.
+  * Drop S02udev startup script (provided by udev-udeb) and ship
+    S02udev-fixup instead to arrange for /.dev to be mounted for programs
+    that still care.
 
   [ Sven Luther ]
   * Adapted to chrp_rs6k -> chrp_ibm transition.

Modified: trunk/packages/rootskel/src/lib/debian-installer-startup.d/Makefile
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/Makefile	2005-11-16 20:38:49 UTC (rev 32182)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/Makefile	2005-11-16 20:51:53 UTC (rev 32183)
@@ -16,7 +16,7 @@
 
 files = \
 	S01mount \
-	S02udev \
+	S02udev-fixup \
 	S03hotplug \
 	S10syslog \
 	S20templates \

Deleted: trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev	2005-11-16 20:38:49 UTC (rev 32182)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev	2005-11-16 20:51:53 UTC (rev 32183)
@@ -1,43 +0,0 @@
-UDEVSTART=/sbin/udevstart
-
-tmpfs_size=5M
-
-# I hate this hack.  -- Md
-make_extra_nodes () {
-	[ -e /etc/udev/links.conf ] || return 0
-	grep '^[^#]' /etc/udev/links.conf | \
-	while read type name arg1; do
-		([ "$type" ] && [ "$name" ] && \
-		 [ ! -e "/dev/$name" ] && [ ! -L "/dev/$name" ]) || continue
-		case $type in
-			L) ln -s "$arg1" "/dev/$name" ;;
-			D) mkdir -p "/dev/$name" ;;
-			M) mknod -m 600 "/dev/$name" $arg1 ;;
-			*) echo "links.conf: unparseable line ($type $name $arg1)" ;;
-		esac
-	done
-}
-
-if [ -x "$UDEVSTART" ] && [ -f /proc/sys/kernel/hotplug ]; then
-	case $(uname -r) in
-		2.[012345].*)
-			echo "d-i built with udev, but running pre-2.6 kernel!"
-			exit 1
-			;;
-	esac
-
-	echo 'Mounting a tmpfs over /dev...'
-	mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev
-	mkdir /dev/.udevdb
-
-	# needed to make some programs (e.g. mdrun) behave correctly
-	mkdir -p /.dev
-	mount -o bind /dev /.dev
-
-	echo "Creating initial device nodes..."
-	echo /sbin/udevsend > /proc/sys/kernel/hotplug
-	$UDEVSTART
-	make_extra_nodes
-
-	mount /dev/pts
-fi

Copied: trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev-fixup (from rev 32138, trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev)
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/S02udev-fixup	2005-11-16 20:51:53 UTC (rev 32183)
@@ -0,0 +1,6 @@
+# This is S02udev-fixup because udev-udeb already installs S02udev.
+if type udevd >/dev/null 2>&1; then
+	# needed to make some programs (e.g. mdrun) behave correctly
+	mkdir -p /.dev
+	mount -o bind /dev /.dev
+fi