merge changes from taroon-branch. this merges up to anaconda-9.0.2-1.RHEL

2 files changed, 54 insertions, 17 deletions

diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index e3b6f4f51..6a9fd3bfa 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -219,9 +219,11 @@ class XCustomWindow (InstallWindow):
         self.desktop = desktop
 	self.instClass = instClass
 
-	if not xsetup.imposed_sane_default:
-	    xsetup.xhwstate.choose_sane_default()
-	    xsetup.imposed_sane_default = 1
+        # dont do anything on ppc - we want to use default fb setting
+        if iutil.getArch() != "ppc":
+            if not xsetup.imposed_sane_default:
+                xsetup.xhwstate.choose_sane_default()
+                xsetup.imposed_sane_default = 1
 
 	# save so we can restore if necessary going back
 	self.origres = self.xsetup.xhwstate.get_resolution()
@@ -776,6 +778,10 @@ class XConfigWindow (InstallWindow):
             self.dispatch.skipStep("writexconfig", skip = 0)
             self.xsetup.skipx = 0
 
+	# if ppc then we bail now, you cant selected videocard for ppc
+	if iutil.getArch() == "ppc":
+	    return None
+
         # set videocard type (assuming we're working with PRIMARY card)
         if self.currentCard:
 	    try:
@@ -805,6 +811,8 @@ class XConfigWindow (InstallWindow):
         else:
 	    selected = None
 
+        
+        # see if they actually picked a card, otherwise keep going
 	if selected == None:
             self.intf.messageWindow(_("Unspecified video card"),
                             _("You need to pick a video card before "
@@ -813,11 +821,6 @@ class XConfigWindow (InstallWindow):
                               "choose the 'Skip X Configuration' button."))
             raise gui.StayOnScreen
 
-        
-        # see if they actually picked a card, otherwise keep going
-
-
-
         # sniff out the selected ram size
         menu = self.ramOption.get_menu ().get_active()
         index = 0
@@ -842,7 +845,8 @@ class XConfigWindow (InstallWindow):
         return None
 
     def skipToggled (self, widget, *args):
-        self.configbox.set_sensitive (not widget.get_active ())
+	if not self.force_ppc_fb:
+	    self.configbox.set_sensitive (not widget.get_active ())
 
     def selectCardType (self, selection, *args):
 	if self.ignoreEvents:
@@ -941,9 +945,20 @@ class XConfigWindow (InstallWindow):
 
         self.autoBox = gtk.VBox (gtk.FALSE, 5)
 
+	self.force_ppc_fb = 0
         arch = iutil.getArch()
         # we can only probe video ram on i386
-        if arch != "i386":
+	# and we force frame buffer on ppc currently
+	if arch == "ppc":
+            label = makeFormattedLabel (_("Your system will be setup to "
+					  "use the frame buffer driver for "
+					  "the X Window System.  If you do "
+					  "not want to setup the X Window "
+					  "System , choose "
+					  "'Skip X Configuration' below."))
+            box.pack_start (label, gtk.FALSE, gtk.FALSE)
+	    self.force_ppc_fb = 1
+        elif arch != "i386":
             label = makeFormattedLabel (_("Your video ram size can not be "
                                           "autodetected.  Choose your video "
                                           "ram size from the choices below:"))
@@ -1030,7 +1045,10 @@ class XConfigWindow (InstallWindow):
         sw.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 	sw.set_shadow_type(gtk.SHADOW_IN)
         sw.add (self.cardview)
-        box.pack_start (sw, gtk.TRUE)
+
+	# only show this option on non-ppc
+	if not self.force_ppc_fb:
+	    box.pack_start (sw, gtk.TRUE)
 
         #Memory configuration menu
         hbox = gtk.HBox()
@@ -1056,7 +1074,10 @@ class XConfigWindow (InstallWindow):
         hbox.pack_start(self.ramOption, gtk.TRUE, gtk.TRUE, 25)
 
         self.ramOption.set_menu (self.ramMenu)
-        box.pack_start (hbox, gtk.FALSE)
+
+	# only show this option on non-ppc
+	if not self.force_ppc_fb:
+	    box.pack_start (hbox, gtk.FALSE)
 
         restore = gtk.Button (_("Restore _original values"))
         restore.connect ("clicked", self.restorePressed)
@@ -1069,8 +1090,13 @@ class XConfigWindow (InstallWindow):
         
         self.topbox = gtk.VBox (gtk.FALSE, 5)
         self.topbox.set_border_width (5)
-        self.topbox.pack_start (box, gtk.TRUE, gtk.TRUE)
-        self.topbox.pack_start (self.skip, gtk.FALSE)
+	if self.force_ppc_fb:
+	    # tweak packing
+	    self.topbox.pack_start (box, gtk.FALSE, gtk.FALSE)
+	    self.topbox.pack_start (self.skip, gtk.FALSE, gtk.FALSE)
+	else:
+	    self.topbox.pack_start (box, gtk.TRUE, gtk.TRUE)
+	    self.topbox.pack_start (self.skip, gtk.FALSE)
         
         self.configbox = box
         
diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py
index 78aa31422..f76897dbb 100644
--- a/iw/zipl_gui.py
+++ b/iw/zipl_gui.py
@@ -71,6 +71,9 @@ class ZiplWindow (InstallWindow):
 
         box  = gtk.VBox(gtk.FALSE, 5)
         box.set_border_width(5)
+
+        label = gtk.Label(_("The z/IPL boot loader will be installed on your "
+                            "system."))
         label = gtk.Label(_("The z/IPL Boot Loader will now be installed "
                            "on your system."
                            "\n"
@@ -107,10 +110,18 @@ class ZiplWindow (InstallWindow):
         clabel2 = gtk.Label(_("Chandev Parameters") + ":")
         clabel2.set_alignment(0.0, 0.5)
         self.chandeventry2 = gtk.Entry()
+
         if bl.args and bl.args.get():
-            self.kernelEntry.set_text(bl.args.get())
-        if isys.getDasdPorts():
-            self.kernelEntry.set_text(self.kernelEntry.get_text() + " dasd=" + isys.getDasdPorts())
+            kernelparms = bl.args.get()
+        else:
+            kernelparms = ""
+        if isys.getDasdPorts() and (kernelparms.find("dasd=") == -1):
+            if len(kernelparms) > 0:
+                kernelparms = "%s dasd=%s" %(kernelparms, isys.getDasdPorts())
+            else:
+                kernelparms = "dasd=%s" %(isys.getDasdPorts(),)
+        self.kernelEntry.set_text(kernelparms)
+        
         if bl.args and bl.args.chandevget():
             cdevs = bl.args.chandevget()
             self.chandeventry1.set_text('')