-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Mon, 17 Aug 2009, Steffen Maier wrote:
Since commit d00ef216099104c03c400f56fb21e19089df4a7d
reipl is done currectly for DASD and zFCP in iutil.
---
loader/linuxrc.s390 | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 64d9e69..de1a9d7 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -89,35 +89,13 @@ function checkipv4()
function doshutdown()
{
+ echo $"about to exec shutdown"
exec /sbin/shutdown
exit 0
}
function 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
@@ -3178,7 +3156,7 @@ EOF
/sbin/loader
fi
- doreboot
+ doshutdown
fi # testing
Applied to master, thanks.
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkqLKnYACgkQ5hsjjIy1Vkme4QCgkns2wa2umoOuQxEPbhneQEdk
qPUAn2oeVNXZ7ZIWAp3MebMTMURahZQV
=pW1J
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
