Package: cryptsetup
Version: 2:1.0.5-2
Severity: wishlist
Tags: patch
udevadm merges all the old udev tools
*** /tmp/tmpxsyZ2u
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/initramfs/cryptroot-script: call udevadm instead of udevsettle
* debian/patches/06_call_udevsettle.dpatch: likewise
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers gutsy-updates
APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500, 'gutsy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u cryptsetup-1.0.5/debian/initramfs/cryptroot-script
cryptsetup-1.0.5/debian/initramfs/cryptroot-script
--- cryptsetup-1.0.5/debian/initramfs/cryptroot-script
+++ cryptsetup-1.0.5/debian/initramfs/cryptroot-script
@@ -159,8 +159,8 @@
activate_evms $cryptsource
fi
# Wait for udev to be ready, see https://launchpad.net/bugs/85640
- if [ -x /sbin/udevsettle ]; then
- /sbin/udevsettle --timeout=30
+ if [ -x /sbin/udevadm settle ]; then
+ /sbin/udevadm settle --timeout=30
fi
if [ ! -e $cryptsource ]; then
@@ -239,8 +239,8 @@
if [ $count -lt 3 ]; then
# Wait for udev to be ready, see
https://launchpad.net/bugs/85640
- if [ -x /sbin/udevsettle ]; then
- /sbin/udevsettle --timeout=30
+ if [ -x /sbin/udevadm settle ]; then
+ /sbin/udevadm settle --timeout=30
fi
return 0
else
diff -u cryptsetup-1.0.5/debian/patches/06_call_udevsettle.dpatch
cryptsetup-1.0.5/debian/patches/06_call_udevsettle.dpatch
--- cryptsetup-1.0.5/debian/patches/06_call_udevsettle.dpatch
+++ cryptsetup-1.0.5/debian/patches/06_call_udevsettle.dpatch
@@ -22,8 +22,8 @@
+ * checking here if udevsettle is available and call it if it
+ * is.
+ */
-+ if (0 == access("/sbin/udevsettle", X_OK)) {
-+ system("/sbin/udevsettle");
++ if (0 == access("/sbin/udevadm settle", X_OK)) {
++ system("/sbin/udevadm settle");
+ }
+
r = 0;
