diff options
| -rw-r--r-- | fsset.py | 14 | ||||
| -rw-r--r-- | iw/congrats_gui.py | 14 | ||||
| -rw-r--r-- | iw/xconfig_gui.py | 3 | ||||
| -rw-r--r-- | packages.py | 6 | ||||
| -rw-r--r-- | textw/complete_text.py | 12 | ||||
| -rw-r--r-- | textw/xconfig_text.py | 8 |
6 files changed, 49 insertions, 8 deletions
@@ -484,6 +484,7 @@ class FileSystemSet: self.progressWindow = None self.waitWindow = None self.mountcount = 0 + self.migratedfs = 0 self.reset() def isActive(self): @@ -590,11 +591,17 @@ class FileSystemSet: f.close () def restoreMigratedFstab(self, prefix): + if not self.migratedfs: + return + fname = prefix + "/etc/fstab" if os.access(fname + ".rpmsave", os.R_OK): os.rename(fname + ".rpmsave", fname) def migratewrite(self, prefix): + if not self.migratedfs: + return + fname = prefix + "/etc/fstab" f = open (fname, "r") lines = f.readlines() @@ -823,8 +830,13 @@ class FileSystemSet: # should be OK, we'll still use the device name to mount. pass + def haveMigratedFilesystems(self): + return self.migratedfs def migrateFilesystems (self, chroot='/'): + if self.migratedfs: + return + for entry in self.entries: if not entry.origfsystem: continue @@ -845,6 +857,8 @@ class FileSystemSet: % (entry.device.getDevice(),)) sys.exit(0) + self.migratedfs = 1 + def mountFilesystems(self, instPath = '/', raiseErrors = 0, readOnly = 0): for entry in self.entries: if not entry.fsystem.isMountable(): diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index f1ea749d8..9be3b32fc 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -15,6 +15,7 @@ from gtk import * from gnome.ui import * from iw_gui import * from translate import _, N_ +import iutil class CongratulationWindow (InstallWindow): @@ -42,19 +43,26 @@ class CongratulationWindow (InstallWindow): a.set (0.5, 0.5, 1.0, 1.0) hbox.pack_start (a, FALSE) + if iutil.getArch() != "ia64": + bootstr = _("If you created a boot disk to use to boot your " + "Red Hat Linux system, insert it before you " + "press <Enter> to reboot.\n\n") + else: + bootstr = "" + + label = GtkLabel( _("Congratulations, your Red Hat Linux installation is " "complete.\n\n" "Remove any floppy diskettes you used during the " "installation process and press <Enter> to reboot your system. " "\n\n" - "If you created a boot disk to use to boot your Red Hat Linux " - "system, insert it before you press <Enter> to reboot.\n\n" + "%s" "For information on errata (updates and bug fixes), visit " "http://www.redhat.com/errata.\n\n" "Information on using and configuring your " "system is available in the Red Hat Linux manuals " - "at http://www.redhat.com/support/manuals."), + "at http://www.redhat.com/support/manuals.") % bootstr, ) label.set_line_wrap (TRUE) diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index a8ebf599f..3f55f3189 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -382,6 +382,9 @@ class MonitorWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) self.ics.setNextEnabled (FALSE) + + # XXX - do not want to go backwards into "Make Bootdisk" screen ever + self.ics.setPrevEnabled (FALSE) def selectCb (self, ctree, node, column): diff --git a/packages.py b/packages.py index 990eed550..c0703fd5f 100644 --- a/packages.py +++ b/packages.py @@ -306,6 +306,12 @@ class rpmErrorClass: self.f = f def doMigrateFilesystems(dir, thefsset, diskset, upgrade, instPath): + if dir == DISPATCH_BACK: + return DISPATCH_NOOP + + if thefsset.haveMigratedFilesystems(): + return DISPATCH_NOOP + thefsset.migrateFilesystems (instPath) diff --git a/textw/complete_text.py b/textw/complete_text.py index 70142947d..47f78ff30 100644 --- a/textw/complete_text.py +++ b/textw/complete_text.py @@ -25,19 +25,25 @@ class FinishedWindow: screen.pushHelpLine (string.center(_("<Enter> to reboot"), screen.width)) + if iutil.getArch() != "ia64": + bootstr = _("If you created a boot disk to use to boot your " + "Red Hat Linux system, insert it before you " + "press <Enter> to reboot.\n\n") + else: + bootstr = "" + rc = ButtonChoiceWindow (screen, _("Complete"), _("Congratulations, your Red Hat Linux installation is " "complete.\n\n" "Remove any floppy diskettes you used during the " "installation process and press <Enter> to reboot your system. " "\n\n" - "If you created a boot disk to use to boot your Red Hat Linux " - "system, insert it before you press <Enter> to reboot.\n\n" + "%s" "For information on errata (updates and bug fixes), visit " "http://www.redhat.com/errata.\n\n" "Information on using your " "system is available in the Red Hat Linux manuals at " - "http://www.redhat.com/support/manuals."), + "http://www.redhat.com/support/manuals.") % bootstr, [ _("OK") ], help = "finished", width=60) return INSTALL_OK diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index 7d5223b8a..dda474284 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -414,8 +414,12 @@ class MonitorWindow: rc = bb.buttonPressed (result) if rc == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK + # XXX - dont let them go back to make boot disk screen + ButtonChoiceWindow(screen, _("Error"), + _("You cannot go back from this " + "step."), + buttons = [ TEXT_OK_BUTTON ]) + continue elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK: screen.popWindow() break |