summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rwxr-xr-xanaconda34
-rw-r--r--anaconda.spec.in13
-rw-r--r--dispatch.py3
-rw-r--r--docs/reconfig-mode39
-rw-r--r--firewall.py2
-rw-r--r--flags.py1
-rw-r--r--gui-tags.txt2
-rwxr-xr-xgui.py3
-rw-r--r--installclasses/reconfig.py53
-rw-r--r--instdata.py2
-rw-r--r--iutil.py14
-rw-r--r--iw/account_gui.py6
-rw-r--r--iw/language_support_gui.py12
-rw-r--r--iw/welcome_gui.py65
-rw-r--r--language.py27
-rwxr-xr-xreconfig.init44
-rw-r--r--text.py4
-rw-r--r--textw/complete_text.py15
-rw-r--r--textw/keyboard_text.py7
-rw-r--r--textw/language_text.py7
-rw-r--r--textw/userauth_text.py7
-rw-r--r--textw/welcome_text.py19
-rw-r--r--tui-tags.txt2
-rw-r--r--users.py2
25 files changed, 14 insertions, 370 deletions
diff --git a/Makefile b/Makefile
index 4357eebf3..3bc5e223b 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,6 @@ install:
mkdir -p $(DESTDIR)/$(RUNTIMEDIR)
mkdir -p $(DESTDIR)/$(ANACONDADATADIR)
- cp -a reconfig.init $(DESTDIR)/etc/rc.d/init.d/reconfig
install -m 755 anaconda $(DESTDIR)/usr/sbin/anaconda
install -m 755 anaconda-stub $(DESTDIR)/$(RUNTIMEDIR)
install -m 644 anaconda.conf $(DESTDIR)/$(ANACONDADATADIR)
diff --git a/anaconda b/anaconda
index 49fbc78fb..cf016983f 100755
--- a/anaconda
+++ b/anaconda
@@ -88,7 +88,7 @@ else:
try:
(args, extra) = isys.getopt(theargs, 'GTRxtdr:fm:',
- [ 'text', 'reconfig', 'xmode', 'test', 'debug', 'nofallback',
+ [ 'text', 'xmode', 'test', 'debug', 'nofallback',
'method=', 'rootpath=', 'pcic=', "overhead=",
'testpath=', 'mountfs', 'traceonly', 'kickstart=',
'lang=', 'keymap=', 'module=', 'class=',
@@ -125,7 +125,7 @@ overhead = 0 # kilobytes of memory used already
runres = '800x600' # resolution to run the GUI install in
nofbmode = 0 # don't use framebuffer X, no matter what
instClass = None # the install class to use
-progmode = 'install' # 'reconfig', 'rescue', or 'install'
+progmode = 'install' # 'rescue', or 'install'
method = None # URL representation of install method
logFile = None # may be a file object or a file name
@@ -189,13 +189,6 @@ for n in args:
rescue_nomount = 1
elif (str == '--overhead'):
overhead = int(arg)
- elif (str == '-R' or str == '--reconfig'):
- progmode = 'reconfig'
- rootPath = '/'
- logFile = "/var/log/reconfig.log"
- flags.setupFilesystems = 0
- flags.reconfig = 1
- customClass = 'reconfig'
elif (str == '--rescue'):
progmode = 'rescue'
elif (str == "--autostep"):
@@ -221,7 +214,7 @@ for n in args:
logFile = "/tmp/anaconda-s390.log"
#
-# must specify install, rescue or reconfig mode
+# must specify install, rescue mode
#
if (progmode == 'rescue'):
@@ -240,8 +233,6 @@ if (progmode == 'rescue'):
# shouldn't get back here
sys.exit(1)
-elif (progmode == 'reconfig'):
- pass
else:
if (not method):
sys.stderr.write('no install method specified\n')
@@ -403,14 +394,6 @@ if 1:
else:
sys.stdout.write(_("Skipping mouse probe.\n"))
-# determine which mode reconfig should use
-if (progmode == 'reconfig'):
- if (iutil.getDefaultRunlevel() == '5' and
- os.access("/etc/X11/XF86Config", os.R_OK)):
- display_mode = 'g'
- else:
- display_mode = 't'
-
if (display_mode != 't' and method and
method.startswith('ftp://') or
method.startswith('http://') or
@@ -475,17 +458,6 @@ if display_mode == 'g':
card = videohw.primaryCard()
xcfg = xf86config.XF86Config(card, monitorhw, mousehw, runres)
-elif progmode != 'reconfig':
- import xf86config
-
- # only probe X related stuff if we're doing an install
- if iutil.getArch() == "s390":
- # XXX why doesn't videohw.primaryCard() dtrt on s390?
- card = videocard.VideoCard()
- else:
- card = videohw.primaryCard()
- xcfg = xf86config.XF86Config(card, monitorhw, mousehw, runres)
-
import configFileData
configFile = configFileData.configFileData()
configFileData = configFile.getConfigData()
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 1ed543be5..d47ea09a4 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -48,14 +48,6 @@ strip $RPM_BUILD_ROOT/usr/lib/anaconda/*.so
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-chkconfig --add reconfig
-
-%preun
-if [ $1 = 0 ]; then
- chkconfig --del reconfig
-fi
-
%files
%defattr(-,root,root)
%doc COPYING
@@ -65,8 +57,6 @@ fi
/usr/share/locale/*/*/*
/usr/lib/anaconda
-%config /etc/rc.d/init.d/reconfig
-
%files runtime
%defattr(-,root,root)
/usr/lib/anaconda-runtime
@@ -77,6 +67,9 @@ fi
* %{date} Anaconda team <bugzilla@redhat.com>
- built new version from CVS
+* Thu Feb 07 2002 Michael Fulbright <msf@redhat.com>
+- goodbye reconfig
+
* Thu Jan 31 2002 Jeremy Katz <katzj@redhat.com>
- update the BuildRequires a bit
diff --git a/dispatch.py b/dispatch.py
index 54cab878e..7ee94aa58 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -50,8 +50,6 @@ installSteps = [
("language", ("intf", "id.instLanguage")),
("keyboard", ("id.instLanguage", "id.keyboard", "id.xconfig")),
("mouse", ("id.mouse",)),
- ("reconfigwelcome", ()),
- ("reconfigkeyboard", ("id.instLanguage", "id.keyboard", "id.xconfig")),
("installtype", ("dispatch", "id", "method", "intf")),
("findrootparts", findRootParts, ("intf", "id", "dir", "instPath")),
("findinstall", ("dispatch", "intf", "id", "instPath")),
@@ -131,7 +129,6 @@ installSteps = [
("writexconfig", writeXConfiguration, ("id", "instPath")),
("writeksconfig", writeKSConfiguration, ("id", "instPath")),
("complete", ()),
- ("reconfigcomplete", ())
]
class Dispatcher:
diff --git a/docs/reconfig-mode b/docs/reconfig-mode
deleted file mode 100644
index 2561085fc..000000000
--- a/docs/reconfig-mode
+++ /dev/null
@@ -1,39 +0,0 @@
-Reconfig mode
--------------
-
-12/7/1999 Michael Fulbright
-
-Reconfig mode is intended to allow localized customization of a pre-installed
-Red Hat Linux box by the first time user of the machine. Properties like
-keyboard mapping, timezone, and network config are edittable the first
-time the computer is booted.
-
-Reconfig mode uses the same sources as the anaconda installer. When anaconda
-is run in reconfig mode (using the --reconfig command line option) the
-user is prompted for various configuration details.
-
-The standard way of setting up anaconda for reconfig mode is to create
-the file
-
-/etc/reconfigSys
-
-as part of the installation process. This can easily be done as part of the
-kickstart procedure with a %post section at the end of the ks.cfg file:
-
-%post
-touch /etc/reconfigSys
-
-The /etc/rc.d/init.d/reconfig init script is run and it tests for the
-existence of the /etc/reconfigSys file. If it exists then anaconda is
-run with the --reconfig option.
-
-An alternate way to cause reconfig mode to be entered is to place the
-kernel option 'reconfig' on the boot prompt command line for the kernel.
-Using LILO for the boot loader, for example, one would start the
-standard linux image with:
-
-LILO: linux reconfig
-
-and the system would enter reconfigure mode.
-
-
diff --git a/firewall.py b/firewall.py
index 1dbb4c04e..b6df97303 100644
--- a/firewall.py
+++ b/firewall.py
@@ -88,7 +88,7 @@ class Firewall:
args = args + self.getArgList()
try:
- if flags.setupFilesystems or flags.reconfig:
+ if flags.setupFilesystems:
iutil.execWithRedirect(args[0], args, root = instPath,
stdout = None, stderr = None)
else:
diff --git a/flags.py b/flags.py
index bd368b103..6f3fc1459 100644
--- a/flags.py
+++ b/flags.py
@@ -31,7 +31,6 @@ class Flags:
self.__dict__['flags']['test'] = 0
self.__dict__['flags']['expert'] = 0
self.__dict__['flags']['serial'] = 0
- self.__dict__['flags']['reconfig'] = 0
self.__dict__['flags']['setupFilesystems'] = 1
self.__dict__['flags']['autostep'] = 0
diff --git a/gui-tags.txt b/gui-tags.txt
index b9ef8e7c6..ee5cf4f6f 100644
--- a/gui-tags.txt
+++ b/gui-tags.txt
@@ -14,7 +14,6 @@ iw/confirm_gui.py
iw/congrats_gui.py
CongratulationWindow NA
- ReconfigCongratulationWindow NA
iw/dependencies_gui.py
UnresolvedDependenciesWindow "depend"
@@ -64,7 +63,6 @@ timezone_gui.py
iw/welcome_gui.py
WelcomeWindow "wel"
- ReconfigWelcomeWindow "welreconfig"
iw/xconfig_gui.py
XCustomWindow "xcustom"
diff --git a/gui.py b/gui.py
index 35b97bd42..c9f888328 100755
--- a/gui.py
+++ b/gui.py
@@ -64,9 +64,6 @@ stepToClass = {
"install" : ("progress_gui", "InstallProgressWindow"),
"bootdisk" : ("bootdisk_gui", "BootdiskWindow"),
"complete" : ("congrats_gui", "CongratulationWindow"),
- "reconfigwelcome" : ("welcome_gui", "ReconfigWelcomeWindow"),
- "reconfigkeyboard" : ("keyboard_gui", "KeyboardWindow"),
- "reconfigcomplete" : ("congrats_gui", "ReconfigCongratulationWindow")
}
if iutil.getArch() == 'sparc':
diff --git a/installclasses/reconfig.py b/installclasses/reconfig.py
deleted file mode 100644
index ef41036a1..000000000
--- a/installclasses/reconfig.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from installclass import BaseInstallClass
-from instdata import InstallData
-from translate import N_
-from translate import _
-import os
-import iutil
-
-class ReconfigInstallData(InstallData):
-
- def write(self, instPath):
- self.langSupport.write (instPath)
- self.keyboard.write (instPath)
- self.network.write (instPath)
- self.auth.write (instPath)
- self.firewall.write (instPath)
- self.timezone.write (instPath)
- self.rootPassword.write (instPath, self.auth)
- self.accounts.write (instPath, self.auth)
-
- def writeKS(self, file):
- pass
-
-class InstallClass(BaseInstallClass):
- name = "reconfig"
- pixmap = None
- sortPriority = 999999
- hidden = 1
-
- parentClass = None
-
- def setSteps(self, dispatch):
- dispatch.setStepList(
- "reconfigwelcome",
- "reconfigkeyboard",
- "networkdevicecheck",
- "network",
- "firewall",
- "languagesupport",
- "timezone",
- "accounts",
- "authentication",
- "writeconfig",
- "reconfigcomplete"
- )
-
- installDataClass = ReconfigInstallData
-
- def __init__(self, expert):
- BaseInstallClass.__init__(self, expert)
-
- if (iutil.getDefaultRunlevel() != '5' or
- not os.access("/etc/X11/XF86Config", os.R_OK)):
- forceTextMode = 1
diff --git a/instdata.py b/instdata.py
index 71e0a1d9e..5fa793ca2 100644
--- a/instdata.py
+++ b/instdata.py
@@ -48,7 +48,7 @@ class InstallData:
# - The install language
# - The keyboard
- self.langSupport = language.Language(flags.reconfig)
+ self.langSupport = language.Language()
self.instClass = None
self.network = network.Network()
self.firewall = firewall.Firewall()
diff --git a/iutil.py b/iutil.py
index 17c36c988..77680cb28 100644
--- a/iutil.py
+++ b/iutil.py
@@ -257,20 +257,6 @@ def mkdirChain(dir):
if (not os.path.isdir(path)):
os.mkdir(path, 0755)
-#
-# get default runlevel - only for use in reconfig mode
-#
-def getDefaultRunlevel ():
- inittab = open ('/etc/inittab', 'r')
- lines = inittab.readlines ()
- inittab.close ()
- for line in lines:
- if len (line) > 3 and line[:3] == "id:":
- fields = string.split (line, ':')
- return fields[1]
-
- return None
-
def makerelname(relpath, filename):
if relpath != '':
return relpath+'/'+filename
diff --git a/iw/account_gui.py b/iw/account_gui.py
index 41f3aac3a..36402a9e0 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -463,12 +463,6 @@ class AccountWindow (InstallWindow):
# XXX hack
self.users = self.users + 1
- if flags.reconfig:
- label.set_sensitive(gtk.FALSE)
- self.add.set_sensitive(gtk.FALSE)
- self.edit.set_sensitive(gtk.FALSE)
- self.delete.set_sensitive(gtk.FALSE)
-
box.set_border_width (5)
return box
diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py
index e8cd4efc7..da9cca665 100644
--- a/iw/language_support_gui.py
+++ b/iw/language_support_gui.py
@@ -132,11 +132,8 @@ class LanguageSupportWindow (InstallWindow):
sep = gtk.HSeparator ()
vbox.pack_start (sep, gtk.FALSE, 15)
- if flags.reconfig:
- label = gtk.Label (_("Currently installed languages:"))
- else:
- label = gtk.Label (_("Choose additional languages you would "
- "like to use on this system:"))
+ label = gtk.Label (_("Choose additional languages you would "
+ "like to use on this system:"))
label.set_alignment (0.0, 0.5)
label.set_line_wrap (gtk.TRUE)
@@ -206,9 +203,4 @@ class LanguageSupportWindow (InstallWindow):
button = gtk.Button (_("Select as default"))
alignment.add (button)
- # in reconfig mode make some widgets unchangable
- if flags.reconfig:
- self.language.set_sensitive(gtk.FALSE)
- all_button.set_sensitive(gtk.FALSE)
-
return vbox
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index aa8cb4a98..45cea6583 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -40,68 +40,3 @@ class WelcomeWindow (InstallWindow):
return frame
-class ReconfigWelcomeWindow (InstallWindow):
-
- windowTitle = N_("Welcome")
- htmlTag = "welreconfig"
-
- def __init__ (self, ics):
- InstallWindow.__init__ (self, ics)
- ics.setNextEnabled (1)
- self.beingDisplayed = 0
-
- def getNext (self):
- if not self.beingDisplayed: return
-
- if self.cancelChoice.get_active():
- import sys
-
- print (_("Exiting anaconda now"))
- sys.exit(0)
- else:
- self.beingDisplay = 0
- return None
-
- # ReconfigWelcomeWindow tag="welreconfig"
- def getScreen (self):
-
-
- frame = gtk.Frame ()
- frame.set_shadow_type (gtk.SHADOW_IN)
-
- box = gtk.VBox (gtk.FALSE)
- box.set_border_width (5)
- frame.add (box)
-
- pix = self.ics.readPixmap ("first-375.png")
-
- if pix:
- ebox = gtk.EventBox ()
- ebox.modify_bg(gtk.STATE_NORMAL, ebox.get_style ().white)
- ebox.add (pix)
- box.pack_start (ebox, gtk.FALSE)
-
- label = gtk.Label(_("Would you like to configure your system?"))
- label.set_line_wrap(gtk.TRUE)
- label.set_alignment(0.0, 0.0)
- label.set_size_request(400, -1)
-
- box.pack_start(label)
-
- radioBox = gtk.VBox (gtk.FALSE)
- self.continueChoice = gtk.RadioButton (None, _("Yes"))
- radioBox.pack_start(self.continueChoice, gtk.FALSE)
- self.cancelChoice = gtk.RadioButton(
- self.continueChoice, _("No"))
- radioBox.pack_start(self.cancelChoice, gtk.FALSE)
-
- align = gtk.Alignment()
- align.add(radioBox)
- align.set(0.5, 0.5, 0.0, 0.0)
-
- box.pack_start(align, gtk.TRUE, gtk.TRUE)
- box.set_border_width (5)
- self.beingDisplayed = 1
-
- return frame
-
diff --git a/language.py b/language.py
index e04d42fe6..bfae632b1 100644
--- a/language.py
+++ b/language.py
@@ -168,7 +168,7 @@ class InstallTimeLanguage:
# which language to set as the default.
class Language (SimpleConfigFile):
- def __init__ (self, useInstalledLangs):
+ def __init__ (self):
self.info = {}
self.info["SUPPORTED"] = None
self.supported = []
@@ -182,27 +182,6 @@ class Language (SimpleConfigFile):
langFilter = {}
allInstalledFlag = 0
- if useInstalledLangs:
- # load from /etc/sysconfig/i18n
- supported = None
- if os.access("/etc/sysconfig/i18n", os.R_OK):
- f = open("/etc/sysconfig/i18n")
- lines = f.readlines()
- f.close()
- for line in lines:
- if line[0:9] == "SUPPORTED":
- tmpstr = line[11:]
- supported = tmpstr[:string.find(tmpstr,'\"')]
- break
-
- # if no info on current system, with RH 7.1 this means ALL
- # languages were installed
- if not supported:
- allInstalledFlag = 1
- else:
- for lang in string.split(supported, ":"):
- langFilter[lang] = 1
-
langsInstalled = []
if os.access("/usr/share/anaconda/locale-list", os.R_OK):
f = open("/usr/share/anaconda/locale-list")
@@ -224,10 +203,6 @@ class Language (SimpleConfigFile):
self.langInfoByName = langInfoByName
self.allSupportedLangs = allSupportedLangs
- # set languages which were selected at install time for reconfig mode
- if useInstalledLangs:
- self.setSupported(langsInstalled)
-
def getAllSupported(self):
return self.allSupportedLangs
diff --git a/reconfig.init b/reconfig.init
deleted file mode 100755
index b272f0a46..000000000
--- a/reconfig.init
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# reconfig This scripts runs the system reconfig program
-#
-# chkconfig: 345 06 95
-# description: If /etc/reconfigSys exists, run the reconfiguration
-# program and remove /etc/reconfigSys when done.
-#
-# Also will run if 'reconfig' is on the kernel cmdline.
-#
-# Source function library.
-. /etc/init.d/functions
-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
-export LANG
-
-RETVAL=$?
-
-#
-# this is required to avoid system logging intercepting input/output
-# action on
-#
-
-case "$1" in
- start)
- if grep -i reconfig /proc/cmdline >/dev/null || [ -f /etc/reconfigSys ]; then
- echo -n "Running system reconfiguration tool"
- /usr/sbin/anaconda --reconfig
- rm -f /etc/reconfigSys
- fi
-
- # We don't want to run this on random runlevel changes.
- touch /var/lock/subsys/reconfig
-
- ;;
- stop)
- rm -f /var/lock/subsys/reconfig
- ;;
- *)
- echo "Usage: reconfig {start|stop}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/text.py b/text.py
index e91d8a008..b29498c32 100644
--- a/text.py
+++ b/text.py
@@ -35,7 +35,6 @@ stepToClasses = {
"keyboard" : ("keyboard_text", "KeyboardWindow"),
"mouse" : ("mouse_text", ("MouseWindow", "MouseDeviceWindow")),
"welcome" : ("welcome_text", "WelcomeWindow"),
- "reconfigwelcome" : ("welcome_text", "ReconfigWelcomeWindow"),
"installtype" : ("installpath_text", "InstallPathWindow"),
"autopartition" : ("partition_text", "AutoPartitionWindow"),
"custom-upgrade" : ("upgrade_text", "UpgradeExamineWindow"),
@@ -72,11 +71,8 @@ stepToClasses = {
"bootdisk" : ("bootdisk_text", ("BootDiskWindow",
"MakeBootDiskWindow")),
"complete" : ("complete_text", "FinishedWindow"),
- "reconfigcomplete" : ("complete_text", "ReconfigFinishedWindow"),
}
-stepToClasses["reconfigkeyboard"] = stepToClasses["keyboard"]
-
if iutil.getArch() == 'sparc':
stepToClasses["bootloader"] = ("silo_text", ("SiloAppendWindow",
"SiloWindow"
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
-
diff --git a/tui-tags.txt b/tui-tags.txt
index 77eb801cd..4b44e849e 100644
--- a/tui-tags.txt
+++ b/tui-tags.txt
@@ -7,11 +7,9 @@ text.py:
UpgradeExamineWindow "multipleroot"
CustomizeUpgradeWindow "custupgrade"
WelcomeWindow "welcome"
- ReconfigWelcomeWindow "reconfigwelcome"
XconfigWindow "xprobe" and "videocard" and "xserver"
BeginInstallWindow "begininstall" and "beginupgrade"
FinishedWindow "finished"
- ReconfigFinishedWindow "reconfigfinished"
textw/bootdisk_text.py
BootDiskWindow "bootdiskquery"
diff --git a/users.py b/users.py
index c33e0ec4f..6a417c648 100644
--- a/users.py
+++ b/users.py
@@ -246,7 +246,7 @@ class Authentication:
args = args + self.getArgList()
try:
- if flags.setupFilesystems or flags.reconfig:
+ if flags.setupFilesystems:
iutil.execWithRedirect(args[0], args,
stdout = None, stderr = None,
searchPath = 1,