diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 41f883f..6e56ee6 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -204,24 +204,6 @@ systemctl --no-reload disable atd.service 2> /dev/null || : systemctl stop crond.service 2> /dev/null || : systemctl stop atd.service 2> /dev/null || : -# and hack so that we eject the cd on shutdown if we're using a CD... -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 /run/initramfs/livedev) >/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 - EOF # bah, hal starts way too late