From 94698e8c40d5c8fbba31e8c415c5f80a2d52ac33 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 2 Nov 2009 15:40:56 -0500 Subject: [PATCH] XXX: This often gets stuck during shutdown because /etc/init.d/halt (or something else still running) wants to read files from the block\ device that was ejected. Disable for now. Bug #531924 --- fedora-live-base.ks | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 9c4e945..1bd899f 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -254,13 +254,16 @@ sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then cat >> /sbin/halt.local << FOE #!/bin/bash +# XXX: This often gets stuck during shutdown because /etc/init.d/halt +# (or something else still running) wants to read files from the block\ +# device that was ejected. Disable for now. Bug #531924 # we want to eject the cd on halt, but let's also try to avoid # io errors due to not being able to get files... -cat /sbin/halt > /dev/null -cat /sbin/reboot > /dev/null -/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 -echo "Please remove the CD from your drive and press Enter to finish restarting" -read -t 30 < /dev/console +#cat /sbin/halt > /dev/null +#cat /sbin/reboot > /dev/null +#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 +#echo "Please remove the CD from your drive and press Enter to finish restarting" +#read -t 30 < /dev/console FOE chmod +x /sbin/halt.local fi