summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rwxr-xr-xhooks/udev8
-rwxr-xr-xmkinitramfs9
3 files changed, 10 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index f8f3ba1..ee6a61f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ initramfs-tools (0.40) unstable; urgency=high
* High urgency upload as udev changed under our feet. Fix RC bugs.
- * Add needed bits under /lib/udev: udevsynthesize, udev_run_devd,
- udev_run_hotplugd. (Closes: #340257)
+ * hooks/udev: Add needed bits: udevsynthesize. (Closes: #340257)
+ Move good bits from global mkinitramfs.
* Pump udev dep on 0.074-3.
diff --git a/hooks/udev b/hooks/udev
index 41c96fe..4776d85 100755
--- a/hooks/udev
+++ b/hooks/udev
@@ -25,3 +25,11 @@ esac
force_load unix
+cp -a /etc/udev ${DESTDIR}/etc
+
+# Hack until udev is built with klibc
+copy_exec /sbin/udevd /sbin
+copy_exec /sbin/udevsynthesize /sbin
+
+mkdir "${DESTDIR}/lib/udev"
+copy_exec /lib/udev/udevsynthesize /lib/udev
diff --git a/mkinitramfs b/mkinitramfs
index c97b575..1cba5d5 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -169,15 +169,6 @@ for f in $(cd ${CONFDIR}/scripts && \
cp -p "${CONFDIR}/scripts/${f}" "${DESTDIR}/scripts/$(dirname "${f}")"
done
copy_exec "${CONFDIR}/initramfs.conf" /conf
-cp -a /etc/udev "${DESTDIR}/etc"
-
-# Hack until udev is built with klibc
-copy_exec /sbin/udevd /sbin
-mkdir "${DESTDIR}/lib/udev"
-copy_exec /lib/udev/udevsynthesize /lib/udev
-cp /sbin/udevsynthesize "${DESTDIR}/sbin"
-copy_exec /lib/udev/udev_run_devd /lib/udev
-copy_exec /lib/udev/udev_run_hotplugd /lib/udev
# Busybox
rm ${DESTDIR}/bin/sh