--- cdrom.image/updates/smeupgradeclass.py	2005/09/20 14:16:48	1.5
+++ cdrom.image/updates/smeupgradeclass.py	2008/03/17 17:28:05	1.11
@@ -4,8 +4,8 @@ from rhpl.log import log
 from constants import *
 
 import os
-import string
 import iutil
+import string
 import security
 
 class Script:
@@ -61,6 +61,7 @@ class InstallClass(BaseInstallClass):
 
     def setSteps(self, dispatch):
 	dispatch.setStepList(
+		    "betanag",
 		    "language",
 		    "keyboard",
                     "findrootparts",
@@ -88,6 +89,16 @@ class InstallClass(BaseInstallClass):
 		    "complete"
 		)
 
+        if iutil.getPPCMachine() == "iSeries":
+            dispatch.skipStep("bootloadersetup", skip = 0)
+
+        if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":
+            dispatch.skipStep("bootloader")
+            dispatch.skipStep("bootloaderadvanced")
+
+        if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":
+            dispatch.skipStep("upgbootloader")            
+
     def postAction(self, rootPath, serial, intf):
         win = intf.waitWindow(_("Post Upgrade Script"),
            _("The post upgrade script is running..."))