diff options
| author | Bill Nottingham <notting@redhat.com> | 2013-05-23 15:14:52 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2013-05-23 15:14:52 -0400 |
| commit | 409caf707439ededed0076d678684593903d13fc (patch) | |
| tree | 91d582f76627fd8f495c7ce4ab1f41ad10850f74 | |
| parent | c47d54f70cdbb27d267b366e4b00efa4bcded0c6 (diff) | |
| download | spin-kickstarts-409caf707439ededed0076d678684593903d13fc.tar.gz spin-kickstarts-409caf707439ededed0076d678684593903d13fc.tar.xz spin-kickstarts-409caf707439ededed0076d678684593903d13fc.zip | |
Don't continue to write a script from the F12/F13 days that does nothing to halt.local.
1) it's entirely commented out, so it does nothing
2) if we wanted to do this now, it would be better done in systemd anyway.
| -rw-r--r-- | fedora-live-base.ks | 18 |
1 files changed, 0 insertions, 18 deletions
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 |