summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog13
-rw-r--r--debian/control2
-rwxr-xr-xinit15
3 files changed, 25 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index ee6a61f..099c3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+initramfs-tools (0.41) unstable; urgency=low
+
+ "Una mattina mi sono svegliato"
+
+ * High urgency upload to cope with newer udev upstream - bonus:
+ condition to test against when udev is ready. (Closes: #341014)
+
+ * Pump udev dep on 0.076-2.
+
+ * Special thanks to Paul Traina for previous udev / emvs work.
+
+ -- maximilian attems <maks@sternwelten.at> Mon, 28 Nov 2005 17:26:40 +0100
+
initramfs-tools (0.40) unstable; urgency=high
* High urgency upload as udev changed under our feet. Fix RC bugs.
diff --git a/debian/control b/debian/control
index 70c2641..2a90d0d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2.0
Package: initramfs-tools
Architecture: all
-Depends: klibc-utils (>= 1.0.14-1ubuntu2), busybox (>= 1:1.01-3), cpio, udev (>= 0.074-3)
+Depends: klibc-utils (>= 1.0.14-1ubuntu2), busybox (>= 1:1.01-3), cpio, udev (>= 0.076-2)
Provides: linux-initramfs-tool
Description: tools for generating an initramfs
This package contains tools to create and boot an initramfs for prepackaged
diff --git a/init b/init
index a1d6923..8b00234 100755
--- a/init
+++ b/init
@@ -71,11 +71,18 @@ depmod -a
# Populate /dev tree
log_begin_msg "Initializing /dev"
-mkdir /dev/.udevdb
-UDEVD_EXPECTED_SEQNUM=$(($(cat /sys/kernel/hotplug_seqnum) + 1)) udevd --daemon
+udevd_timeout=30
+echo > /proc/sys/kernel/hotplug
+mkdir /dev/.udev /dev/.udev/db/ /dev/.udev/queue/
+udevd --daemon
udevsynthesize
-# FIXME: future udevd should have condition to test against
-sleep 5
+while [ -d /dev/.udev/queue/ ]; do
+ sleep 1
+ udevd_timeout=$(($udevd_timeout - 1))
+ if [ $udevd_timeout -eq 0 ]; then
+ break
+ fi
+done
log_end_msg
log_begin_msg "Loading modules"