From fa9a8062e32348f22b475e14c8d9acb9b7963f29 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 13 Sep 2011 13:29:08 +0200 Subject: [PATCH] This saves f4d6f687's fix for [[bugs/sdmem_on_eject_broken_for_CD]]. --- config/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper b/config/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper index 69a47e4a2..acb771fcb 100755 --- a/config/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper +++ b/config/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper @@ -67,9 +67,11 @@ DEV_UDEV_PATH=$(udevadm info --query path $QUERY_SELECTOR) DEV_TYPE_LINE=$(udevadm info --query property $QUERY_SELECTOR | grep -w '^ID_TYPE') DEV_TYPE="${DEV_TYPE_LINE#*=}" -# Let's be sure the CDRom can be ejected by pressing the button +# If the world was sane we'd want to *disable* the eject lock, but it turns out +# that blocks the block events so udev-watchdog never receives the "change" +# event. See [[bugs/sdmem_on_eject_broken_for_CD]]. if [ "$DEV_TYPE" = "cd" ]; then - eject -i off "${BOOT_DEVICE}" + eject -i on "${BOOT_DEVICE}" fi # Start udev-watchdog and stop on clean exit. -- 2.11.4.GIT