diff options
Diffstat (limited to 'loader/linuxrc.s390')
| -rw-r--r-- | loader/linuxrc.s390 | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 9acab9b97..af2d43956 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -61,35 +61,13 @@ checkipv4() doshutdown() { - exec /sbin/shutdown - exit 0 + echo $"about to exec shutdown" + exec /sbin/shutdown + exit 0 } doreboot() { - # find out the location of /boot and use it to re-ipl - boot="$(cat /proc/mounts | grep " /mnt/sysimage/boot " | awk -F" " '{print $1}')" - if [ -z $boot ]; then - # use root if /boot not used - boot="$(cat /proc/mounts | grep " /mnt/sysimage " | awk -F" " '{print $1}')" - fi - - # lookup dasd disk - echo $boot | grep "dasd" > /dev/null - if [ $? -eq 0 ]; then - type="ccw" - boot="$(basename $boot)" - # strip partition number from dasd device - boot="$(echo ${boot%[0-9]})" - id="$(basename $(readlink /sys/block/$boot/device))" - echo $type > /sys/firmware/reipl/reipl_type - echo $id > /sys/firmware/reipl/$type/device - else - # scsi re-ipl only supported on newer machines - doshutdown - exit 0 - fi - echo $"about to exec shutdown -r" exec /sbin/shutdown -r exit 0 @@ -670,7 +648,9 @@ if [ -n "$RUNKS" ]; then /sbin/loader fi -doreboot +# A shutdown needs to be performed here to avoid a loop booting back into the installer +echo $"Finishing up with doshutdown" +doshutdown # ;;; Local Variables: *** # ;;; mode: sh *** |