This time with fixes from Chris. Note that the linuxrc fix is just informative at the end of an install and before a reboot occurs...
---
iutil.py | 5 ++++-
loader/linuxrc.s390 | 10 ++++++++++
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/iutil.py b/iutil.py
index 0b15bd8..0c43684 100644
--- a/iutil.py
+++ b/iutil.py
@@ -980,7 +980,10 @@ def reIPL(anaconda, loader_pid):
reipl_path = "/sys/firmware/reipl"
- ipldev = anaconda.id.bootloader.device
+ try:
+ ipldev = anaconda.platform.bootDevice().disk.name
+ except:
+ ipldev = None
if ipldev is None:
message = _("Error determining mount point type")
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index d50dcbd..71e4d0e 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -95,6 +95,16 @@ function doshutdown()
function doreboot()
{
+ if [ -e "/sys/firmware/reipl" ]; then
+ read REIPL_TYPE < /sys/firmware/reipl/reipl_type
+ echo "reipl_type=$REIPL_TYPE"
+ pushd /sys/firmware/reipl/$REIPL_TYPE >/dev/null 2>&1
+ for i in *; do
+ echo "$i=`cat $i`"
+ done
+ popd >/dev/null 2>&1
+ fi
+
echo $"about to exec shutdown -r"
exec /sbin/shutdown -r
exit 0
--
1.6.4
--
Mark
You must be the change you wish to see in the world. -- Mahatma Gandhi
Worrying is praying for that you do not wish to happen.
_______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
