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

[Colin Watson]

Author: cjwatson
Date: 2005-11-15 22:50:52 +0000 (Tue, 15 Nov 2005)
New Revision: 32139

Modified:
   trunk/packages/rootskel/debian/changelog
   trunk/packages/rootskel/src/init
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/S01mount
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/S40framebuffer-module-linux-x86
   trunk/packages/rootskel/src/sbin/init
Log:
* Look for udevd rather than udevstart to decide whether to do udevish
  things; udevstart has gone away.
* If udevstart is missing, try udevsynthesize instead to attempt to
  encourage udev to settle after loading framebuffer modules.

Modified: trunk/packages/rootskel/debian/changelog
===================================================================
--- trunk/packages/rootskel/debian/changelog	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/debian/changelog	2005-11-15 22:50:52 UTC (rev 32139)
@@ -9,6 +9,10 @@
     directories if they already exist.
   * Discard stderr when trying to load fan and thermal, to avoid noise on
     machines without those devices.
+  * Look for udevd rather than udevstart to decide whether to do udevish
+    things; udevstart has gone away.
+  * If udevstart is missing, try udevsynthesize instead to attempt to
+    encourage udev to settle after loading framebuffer modules.
 
   [ Sven Luther ]
   * Adapted to chrp_rs6k -> chrp_ibm transition.

Modified: trunk/packages/rootskel/src/init
===================================================================
--- trunk/packages/rootskel/src/init	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/src/init	2005-11-15 22:50:52 UTC (rev 32139)
@@ -4,7 +4,7 @@
 . /lib/debian-installer/init-debug
 debugshell "just booted"
 
-if [ -x /sbin/udevstart ]; then
+if [ -x /sbin/udevd ]; then
 	/lib/debian-installer/init-udev-devices
 else
 	mount /dev

Modified: trunk/packages/rootskel/src/lib/debian-installer-startup.d/S01mount
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/S01mount	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/S01mount	2005-11-15 22:50:52 UTC (rev 32139)
@@ -2,7 +2,7 @@
 if [ ! -d /proc/self ] ; then
 	mount -t proc proc /proc
 fi
-if [ ! -e /dev/.devfsd ] && [ ! -x /sbin/udevstart ]; then
+if [ ! -e /dev/.devfsd ] && [ ! -x /sbin/udevd ]; then
 	mount -t devfs devfs /dev
 fi
 if grep -q '[[:space:]]sysfs' /proc/filesystems; then

Modified: trunk/packages/rootskel/src/lib/debian-installer-startup.d/S40framebuffer-module-linux-x86
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/S40framebuffer-module-linux-x86	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/S40framebuffer-module-linux-x86	2005-11-15 22:50:52 UTC (rev 32139)
@@ -3,9 +3,11 @@
 	case $(uname -r) in
 	2.6.*)
 		if (modprobe -q vesafb >/dev/null 2>&1 && grep -q . /proc/fb && modprobe -q fbcon >/dev/null 2>&1) || (modprobe -q vga16fb >/dev/null 2>&1 && grep -q . /proc/fb && modprobe -q fbcon >/dev/null 2>&1); then
-			if [ -x /sbin/udevstart ]; then
-				# sledgehammer workaround for race condition
+			# sledgehammer workaround for race condition
+			if type udevstart >/dev/null 2>&1; then
 				udevstart
+			elif type udevsynthesize >/dev/null 2>&1; then
+				udevsynthesize
 			fi
 		fi
 		;;

Modified: trunk/packages/rootskel/src/sbin/init
===================================================================
--- trunk/packages/rootskel/src/sbin/init	2005-11-15 22:34:45 UTC (rev 32138)
+++ trunk/packages/rootskel/src/sbin/init	2005-11-15 22:50:52 UTC (rev 32139)
@@ -20,7 +20,7 @@
 	cd /mnt
 	pivot_root . initrd
 	mkdir proc
-	if [ -x /sbin/udevstart ]; then
+	if [ -x /sbin/udevd ]; then
 		/lib/debian-installer/init-udev-devices
 	else
 		mount /dev || true