summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-09-13 13:29:08 +0200
committerTails developers <amnesia@boum.org>2011-09-13 16:43:54 +0200
commitad625b35fc334e4f16aaad3d1d8517fc35628262 (patch)
tree763f25cdfae388bb7a471a3ba6d0d2d9476de7df
parent5a8eb1c5b2c3bf55db8dea408cfc4fc39ba3dc22 (diff)
This saves f4d6f687's fix for [[bugs/sdmem_on_eject_broken_for_CD]].
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/udev-watchdog-wrapper6
1 files 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 69a47e4..acb771f 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.