oh yeah goodbye reconfig

5 files changed, 2 insertions, 53 deletions

diff --git a/textw/complete_text.py b/textw/complete_text.py
index 3d778130e..a23a967f3 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -55,18 +55,3 @@ class FinishedWindow:
         return INSTALL_OK
 
 
-class ReconfigFinishedWindow:
-    def __call__ (self, screen):
-        screen.pushHelpLine (string.center(_("<Enter> to exit"),
-                                           screen.width))
-
-        rc = ButtonChoiceWindow (screen, _("Complete"), 
-                _("Congratulations, configuration is complete.\n\n"
-                  "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."),
-                   [ _("OK") ], help = "reconfigfinished")
-
-        return INSTALL_OK
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index 2c4ed7361..70d15f033 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -43,14 +43,9 @@ class KeyboardWindow:
         kbd.set (keyboards[choice])
 	kbd.beenset = 1
 
-	if flags.reconfig:
-	    iutil.execWithRedirect ("/bin/loadkeys",
-				    ["/bin/loadkeys", keyboards[choice]],
-				    stderr = "/dev/null")
-
 	try:
 	    isys.loadKeymap(keyboards[choice])
 	except SystemError, (errno, msg):
-		log("Could not install keymap %s: %s" % (keyboards[choice], msg))
+	    log("Could not install keymap %s: %s" % (keyboards[choice], msg))
         return INSTALL_OK
 
diff --git a/textw/language_text.py b/textw/language_text.py
index 841a748a7..94c0ea4b8 100644
--- a/textw/language_text.py
+++ b/textw/language_text.py
@@ -88,7 +88,7 @@ class LanguageWindow:
 		    except SystemError, (errno, msg):
 			log("Could not load font %s: %s" % (font, msg))
 	    elif os.access("/bin/consolechars", os.X_OK):
-		# test and reconfig
+		# test
 		iutil.execWithRedirect ("/bin/consolechars", 
 			["/bin/consolechars", "-d", "-m", "iso01"])
 
@@ -99,12 +99,7 @@ class LanguageWindow:
 class LanguageSupportWindow:
     def __call__(self, screen, language):
 
-        # in reconfig skip
-        if flags.reconfig:
-            return INSTALL_NOOP
-        
 	# should already be sorted
-
         ct = CheckboxTree(height = 8, scroll = 1)
 
         for lang in language.getAllSupported():
diff --git a/textw/userauth_text.py b/textw/userauth_text.py
index 6c6660251..f52d45eba 100644
--- a/textw/userauth_text.py
+++ b/textw/userauth_text.py
@@ -86,13 +86,6 @@ class UsersWindow:
         pass2 = Entry (10, user["password"], password = 1)
         fullname = Entry (20, user["name"], scroll = 1)
 
-        if flags.reconfig:
-            flag = FLAGS_SET
-            username.setFlags(FLAG_DISABLED, flag)
-            pass1.setFlags(FLAG_DISABLED, flag)
-            pass2.setFlags(FLAG_DISABLED, flag)
-            fullname.setFlags(FLAG_DISABLED, flag)
-
 	if edit:
 	    title = _("Edit User")
 	    helptag = "edituser"
diff --git a/textw/welcome_text.py b/textw/welcome_text.py
index 34a1a547b..974c74cef 100644
--- a/textw/welcome_text.py
+++ b/textw/welcome_text.py
@@ -35,22 +35,3 @@ class WelcomeWindow:
 
         return INSTALL_OK
 
-class ReconfigWelcomeWindow:
-    def __call__(self, screen):
-        rc = ButtonChoiceWindow(screen, _("Red Hat Linux"), 
-                                _("Welcome to the Red Hat Linux!\n\n"
-                                  "You have entered reconfiguration mode, "
-                                  "which will allow you to configure "
-                                  "site-specific options of your computer."
-                                  "\n\n"
-                                  "To exit without changing your setup "
-                                  "select the ""Cancel"" button below."),
-                                buttons = [TEXT_OK_BUTTON, _("Cancel")], width = 50,
-				help = "reconfigwelcome")
-
-	if rc == string.lower(_("Cancel")):
-            screen.finish()
-	    os._exit(0)
-
-        return INSTALL_OK
-