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
This commit is contained in:
Warren Togami 2009-11-02 15:40:56 -05:00
parent d491581401
commit 94698e8c40

View File

@ -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 if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
cat >> /sbin/halt.local << FOE cat >> /sbin/halt.local << FOE
#!/bin/bash #!/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 # 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... # io errors due to not being able to get files...
cat /sbin/halt > /dev/null #cat /sbin/halt > /dev/null
cat /sbin/reboot > /dev/null #cat /sbin/reboot > /dev/null
/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 #/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" #echo "Please remove the CD from your drive and press Enter to finish restarting"
read -t 30 < /dev/console #read -t 30 < /dev/console
FOE FOE
chmod +x /sbin/halt.local chmod +x /sbin/halt.local
fi fi