diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rwxr-xr-x | anaconda | 44 | ||||
| -rwxr-xr-x | gui.py | 2 | ||||
| -rw-r--r-- | installclass.py | 3 | ||||
| -rw-r--r-- | iw/congrats.py | 2 | ||||
| -rw-r--r-- | iw/xconfig.py | 4 | ||||
| -rw-r--r-- | po/anaconda.pot | 60 | ||||
| -rw-r--r-- | todo.py | 4 |
8 files changed, 73 insertions, 74 deletions
@@ -3,7 +3,7 @@ include Makefile.inc ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -SUBDIRSUNCFG = balkan help isys iw pixmaps po textw gnome-map +SUBDIRSRECFG = balkan help isys iw pixmaps po textw gnome-map SUBDIRSHD = rpmmodule kudzu isys balkan libfdisk collage loader stubs po \ minislang textw utils SUBDIRS = $(SUBDIRSHD) gnome-map iw help pixmaps @@ -11,17 +11,17 @@ BUILDONLYSUBDIRS = pump ifeq (i386, $(ARCH)) SUBDIRS += ddcprobe -SUBDIRSUNCFG += ddcprobe +SUBDIRSRECFG += ddcprobe endif # # TOPDIR - ? # DESTDIR - destination for install image for install purposes -# UNCFGDESTDIR - root of destination for install image for unconfig purposes +# RECFGDESTDIR - root of destination for install image for reconfig purposes TOPDIR = ../../.. DESTDIR = ../../../RedHat/instimage -UNCFGDESTDIR = / +RECFGDESTDIR = / CATALOGS = po/anaconda.pot ALLSUBDIRS = $(BUILDONLYSUBDIRS) $(SUBDIRS) @@ -41,21 +41,21 @@ clean: subdirs: for d in $(ALLSUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d; done -install-unconfig: all - @if [ "$(UNCFGDESTDIR)" = "" ]; then \ +install-reconfig: all + @if [ "$(RECFGDESTDIR)" = "" ]; then \ echo " "; \ echo "ERROR: A destdir is required"; \ exit 1; \ fi - mkdir -p $(UNCFGDESTDIR)/usr/sbin - mkdir -p $(UNCFGDESTDIR)/$(PYTHONLIBDIR) - cp -a anaconda $(UNCFGDESTDIR)/usr/sbin/anaconda-unconfig - cp -var $(PYFILES) $(UNCFGDESTDIR)/$(PYTHONLIBDIR) - ./py-compile --basedir $(UNCFGDESTDIR)/$(PYTHONLIBDIR) $(PYFILES) - cp -a *.so $(UNCFGDESTDIR)/$(PYTHONLIBDIR) - cp -a kudzu/kudzumodule.so $(UNCFGDESTDIR)/$(PYTHONLIBDIR) - for d in $(SUBDIRSUNCFG); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(UNCFGDESTDIR); pwd` -C $$d install; done + mkdir -p $(RECFGDESTDIR)/usr/sbin + mkdir -p $(RECFGDESTDIR)/$(PYTHONLIBDIR) + cp -a anaconda $(RECFGDESTDIR)/usr/sbin/anaconda-reconfig + cp -var $(PYFILES) $(RECFGDESTDIR)/$(PYTHONLIBDIR) + ./py-compile --basedir $(RECFGDESTDIR)/$(PYTHONLIBDIR) $(PYFILES) + cp -a *.so $(RECFGDESTDIR)/$(PYTHONLIBDIR) + cp -a kudzu/kudzumodule.so $(RECFGDESTDIR)/$(PYTHONLIBDIR) + for d in $(SUBDIRSRECFG); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(RECFGDESTDIR); pwd` -C $$d install; done install-hd: all @if [ "$(DESTDIR)" = "" ]; then \ @@ -3,7 +3,7 @@ import sys, os # -# For anaconda in unconfig mode +# For anaconda in reconfig mode # sys.path.append('/usr/lib/anaconda') @@ -32,8 +32,8 @@ gettext.bindtextdomain("anaconda", "/usr/share/locale") gettext.textdomain("anaconda") _ = gettext.gettext -(args, extra) = isys.getopt(sys.argv[1:], 'GTUtdr:fm:', - [ 'gui', 'text', 'unconfig', 'test', 'debug', 'method=', 'rootpath=', +(args, extra) = isys.getopt(sys.argv[1:], 'GTRtdr:fm:', + [ 'gui', 'text', 'reconfig', 'test', 'debug', 'method=', 'rootpath=', 'testpath=', 'mountfs', 'traceonly', 'kickstart=', 'lang=', 'keymap=', 'kbdtype=', 'module=', 'expert', 'serial' ]) @@ -64,7 +64,7 @@ display_mode = 'g' # traceOnly - print out loaded modules # forceMount - ? used ? # localInstall - install to chroot -# unconfigOnly - allow user to reconfig installed box w/o reinstall +# reconfigOnly - allow user to reconfig installed box w/o reinstall test = 0 debug = 0 serial = 0 @@ -72,12 +72,12 @@ expert = 0 traceOnly = 0 forceMount = 0 localInstall = 0 -unconfigOnly = 0 +reconfigOnly = 0 # # x - xserver info (?) # lang - language to use for install/machine default -# method - install method (not used if unconfigOnly is true) +# method - install method (not used if reconfigOnly is true) # keymap - kbd map # kbdtype - type of keyboard (84 key, 101 key, etc) # kickstart - ? @@ -100,8 +100,8 @@ for n in args: display_mode = 'g' elif (str == '-T' or str == '--text'): display_mode = 't' - elif (str == '-U' or str == '--unconfig'): - unconfigOnly = 1 + elif (str == '-R' or str == '--reconfig'): + reconfigOnly = 1 elif (str == '-t' or str == '--test'): test = 1 elif (str == '--module'): @@ -134,14 +134,14 @@ for n in args: # # see how we were run, override command line mode selection # -if (execname == "anaconda-unconfig"): - print "overriding to unconfig mode based on script name" - unconfigOnly = 1 +if (execname == "anaconda-reconfig"): + print "overriding to reconfig mode based on script name" + reconfigOnly = 1 # # if not just reconfiguring box, must have install method # -if (not unconfigOnly and not method): +if (not reconfigOnly and not method): print "no install method specified" sys.exit(1) @@ -151,7 +151,7 @@ if (debug): # # don't let a developer reinstall their box unknowingly # -if (not unconfigOnly and not test and not localInstall and os.getpid() > 50): +if (not reconfigOnly and not test and not localInstall and os.getpid() > 50): print "you're running me on a live system! that's incredibly stupid." sys.exit(1) @@ -174,7 +174,7 @@ import lilo from todo import ToDo import isys from installclass import DefaultInstall -from installclass import UnconfigStation +from installclass import ReconfigStation from kickstart import Kickstart # @@ -201,7 +201,7 @@ if (display_mode == 'g' and not os.environ.has_key('DISPLAY')): # setup links required by graphical mode if installing and verify display mode # if (display_mode == 'g'): - if not test and not localInstall and not unconfigOnly: + if not test and not localInstall and not reconfigOnly: for i in ( "imrc", "im_palette.pal", "gtk" ): os.symlink ("../mnt/source/RedHat/instimage/etc/" + i, "/etc/" + i) from gui import InstallInterface @@ -231,7 +231,7 @@ if traceOnly: sys.exit(0) # imports after setting up the path -if not unconfigOnly: +if not reconfigOnly: if (method[0:5] == "dir:/"): from image import InstallMethod method = InstallMethod(method[5:]) @@ -257,8 +257,8 @@ if not unconfigOnly: # # do some final sanity checking before going off into the great wide wonder # -if unconfigOnly and method != None: - print "Conflicting options: cannot unconfig and install simultaneously!\n" +if reconfigOnly and method != None: + print "Conflicting options: cannot reconfig and install simultaneously!\n" sys.exit(1) intf = InstallInterface() @@ -278,8 +278,8 @@ if forceMount: if kickstart: instClass = Kickstart(kickstart) -elif unconfigOnly: - instClass = UnconfigStation() +elif reconfigOnly: + instClass = ReconfigStation() else: instClass = DefaultInstall() @@ -300,7 +300,7 @@ if iutil.getArch() == "sparc": instClass.addToSkipList("mouse") instClass.setMouseType("Sun - Mouse", "sunmouse") -if unconfigOnly: +if reconfigOnly: installPackages = 0 setupFilesystems = 0 rootPath = '/' @@ -309,7 +309,7 @@ try: todo = ToDo(intf, method, rootPath, installSystem = installPackages, setupFilesystems = setupFilesystems, mouse = mouseInfo, instClass = instClass, x = x, expert = expert, - serial = serial, unconfigOnly = unconfigOnly, + serial = serial, reconfigOnly = reconfigOnly, extraModules = extraModules) intf.run(todo, test = test) except: @@ -224,7 +224,7 @@ class InstallInterface: gtkThread.start () # This is the same as the file - if todo.unconfigOnly: + if todo.reconfigOnly: if todo.serial: commonSteps = [ ( LanguageWindow, "language" ), ] diff --git a/installclass.py b/installclass.py index c3a656693..9385b9220 100644 --- a/installclass.py +++ b/installclass.py @@ -287,13 +287,12 @@ class Server(InstallClass): "drive to make room for your Linux installation.")) # reconfig machine w/o reinstall -class UnconfigStation(InstallClass): +class ReconfigStation(InstallClass): def __init__(self): InstallClass.__init__(self) self.setHostname("localhost.localdomain") self.addToSkipList("lilo") - self.addToSkipList("authentication") self.addToSkipList("bootdisk") self.addToSkipList("partition") self.addToSkipList("package-selection") diff --git a/iw/congrats.py b/iw/congrats.py index f16ecf59b..85689e019 100644 --- a/iw/congrats.py +++ b/iw/congrats.py @@ -28,7 +28,7 @@ class CongratulationWindow (InstallWindow): a.set (0.5, 0.5, 1.0, 1.0) hbox.pack_start (a, FALSE) - if not self.ics.cw.todo.unconfigOnly: + if not self.ics.cw.todo.reconfigOnly: label = GtkLabel(_("Congratulations, installation is complete.\n\n" "Remove the boot media and " "press return to reboot. For information on fixes which are " diff --git a/iw/xconfig.py b/iw/xconfig.py index d14e8da37..b5af89424 100644 --- a/iw/xconfig.py +++ b/iw/xconfig.py @@ -168,10 +168,10 @@ class XConfigWindow (InstallWindow): def getScreen (self): # - # if in unconfigOnly mode we query existing rpm db + # if in reconfigOnly mode we query existing rpm db # if X not installed, just skip this step # - if self.todo.unconfigOnly: + if self.todo.reconfigOnly: import rpm db = rpm.opendb() rc = db.findbyname ("XFree86") diff --git a/po/anaconda.pot b/po/anaconda.pot index c1a413610..22633bd36 100644 --- a/po/anaconda.pot +++ b/po/anaconda.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-11-16 18:48-0500\n" +"POT-Creation-Date: 1999-11-17 11:54-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -219,8 +219,8 @@ msgstr "" #: ../loader/loader.c:693 ../loader/loader.c:738 ../loader/loader.c:876 #: ../loader/loader.c:881 ../loader/loader.c:1614 ../loader/loader.c:1660 #: ../loader/loader.c:1729 ../loader/urls.c:201 ../loader/urls.c:206 -#: ../text.py:231 ../text.py:635 ../todo.py:365 ../todo.py:506 ../todo.py:1076 -#: ../todo.py:1407 +#: ../text.py:231 ../text.py:635 ../todo.py:365 ../todo.py:505 ../todo.py:1075 +#: ../todo.py:1406 msgid "Error" msgstr "" @@ -609,119 +609,119 @@ msgstr "" msgid "Error unmounting %s: %s" msgstr "" -#: ../todo.py:507 +#: ../todo.py:506 #, c-format msgid "Error mounting %s: %s" msgstr "" -#: ../todo.py:526 ../todo.py:724 +#: ../todo.py:525 ../todo.py:723 msgid "Creating" msgstr "" -#: ../todo.py:527 +#: ../todo.py:526 msgid "Creating RAID devices..." msgstr "" -#: ../todo.py:576 ../todo.py:589 +#: ../todo.py:575 ../todo.py:588 msgid "Formatting" msgstr "" -#: ../todo.py:577 ../todo.py:590 +#: ../todo.py:576 ../todo.py:589 #, c-format msgid "Formatting %s filesystem..." msgstr "" -#: ../todo.py:724 +#: ../todo.py:723 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:869 +#: ../todo.py:868 msgid "Reading" msgstr "" -#: ../todo.py:870 +#: ../todo.py:869 msgid "Reading package information..." msgstr "" -#: ../todo.py:1033 ../todo.py:1043 +#: ../todo.py:1032 ../todo.py:1042 msgid "no suggestion" msgstr "" -#: ../todo.py:1049 +#: ../todo.py:1048 msgid "Searching" msgstr "" -#: ../todo.py:1050 +#: ../todo.py:1049 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:1077 +#: ../todo.py:1076 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:1096 +#: ../todo.py:1095 msgid "Finding" msgstr "" -#: ../todo.py:1097 +#: ../todo.py:1096 msgid "Finding packages to upgrade..." msgstr "" -#: ../todo.py:1286 +#: ../todo.py:1285 msgid "Processing" msgstr "" -#: ../todo.py:1287 +#: ../todo.py:1286 msgid "Preparing to install..." msgstr "" -#: ../todo.py:1402 +#: ../todo.py:1401 msgid "Rebuilding" msgstr "" -#: ../todo.py:1403 +#: ../todo.py:1402 msgid "Rebuilding RPM database..." msgstr "" -#: ../todo.py:1408 +#: ../todo.py:1407 msgid "Rebuild of RPM database failed. You may be out of disk space?" msgstr "" -#: ../todo.py:1458 +#: ../todo.py:1457 #, c-format msgid "Upgrading %s.\n" msgstr "" -#: ../todo.py:1460 +#: ../todo.py:1459 #, c-format msgid "Installing %s.\n" msgstr "" -#: ../todo.py:1481 +#: ../todo.py:1480 msgid "" "You don't appear to have enough disk space to install the packages you've " "selected. You need more space on the following filesystems:\n" "\n" msgstr "" -#: ../todo.py:1484 +#: ../todo.py:1483 msgid "Mount Point" msgstr "" -#: ../todo.py:1484 +#: ../todo.py:1483 msgid "Space Needed" msgstr "" -#: ../todo.py:1498 +#: ../todo.py:1497 msgid "Disk Space" msgstr "" -#: ../todo.py:1521 +#: ../todo.py:1520 msgid "Post Install" msgstr "" -#: ../todo.py:1522 +#: ../todo.py:1521 msgid "Performing post install configuration..." msgstr "" @@ -267,7 +267,7 @@ class InstSyslog: class ToDo: def __init__(self, intf, method, rootPath, setupFilesystems = 1, installSystem = 1, mouse = None, instClass = None, x = None, - expert = 0, serial = 0, unconfigOnly = 0, extraModules = []): + expert = 0, serial = 0, reconfigOnly = 0, extraModules = []): self.intf = intf self.method = method self.mounts = {} @@ -278,7 +278,7 @@ class ToDo: self.installSystem = installSystem self.language = Language () self.serial = serial - self.unconfigOnly = unconfigOnly + self.reconfigOnly = reconfigOnly self.log = LogFile (serial) self.network = Network () self.rootpassword = Password () |