Merge branch 'master' into storage

Conflicts:
	anaconda
	fsset.py
	iutil.py
	iw/partition_gui.py
	partedUtils.py

1 files changed, 10 insertions, 0 deletions

diff --git a/anaconda b/anaconda
index 4e328b8c3..3abce5dcf 100755
--- a/anaconda
+++ b/anaconda
@@ -497,6 +497,8 @@ class Anaconda:
         self.updateSrc = None
         self.mediaDevice = None
         self.platform = None
+        self.canReIPL = False
+        self.reIPLMessage = None
 
         # *sigh* we still need to be able to write this out
         self.xdriver = None
@@ -1024,3 +1026,11 @@ if __name__ == "__main__":
             isys.ejectCdrom(drive)
 
     del anaconda.intf
+
+    if iutil.isS390():
+        if anaconda.canReIPL:
+            log.info(_("reipl configuration successful => reboot"))
+            os.kill(os.getppid(), signal.SIGUSR2)
+        else:
+            log.info(_("reipl configuration failed => halt"))
+            os.kill(os.getppid(), signal.SIGUSR1)