diff options
| -rwxr-xr-x | gui.py | 3 | ||||
| -rw-r--r-- | iutil.py | 41 | ||||
| -rw-r--r-- | iw/lilo.py | 2 | ||||
| -rw-r--r-- | iw/rootpartition.py | 28 | ||||
| -rw-r--r-- | po/anaconda.pot | 489 | ||||
| -rw-r--r-- | text.py | 109 | ||||
| -rw-r--r-- | todo.py | 2 |
7 files changed, 308 insertions, 366 deletions
@@ -476,8 +476,6 @@ class InstallControlWindow (Thread): Thread.__init__ (self) self.ii = ii self.todo = todo - self.todo.fstab = GuiFstab(todo.setupFilesystems, todo.serial, 0, 0, - todo.intf.waitWindow) self.steps = steps if os.environ.has_key ("LC_ALL"): self.locale = os.environ["LC_ALL"][:2] @@ -601,7 +599,6 @@ class InstallControlWindow (Thread): self.mutex.acquire () - class InstallControlState: def __init__ (self, cw, ii, todo, title = "Install Window", prevEnabled = 1, nextEnabled = 0, html = ""): @@ -1,5 +1,5 @@ -import types, os, sys, isys, select, string +import types, os, sys, isys, select, string, stat def getArch (): arch = os.uname ()[4] @@ -168,3 +168,42 @@ def getDefaultRunlevel (): return fields[1] return None + +def makerelname(relpath, filename): + if relpath != '': + return relpath+'/'+filename + else: + return filename + + +def findtz(basepath, relpath): + tzdata = [] + for n in os.listdir(basepath+'/'+relpath): + timezone = makerelname(relpath, n) + if relpath != '': + timezone = relpath+'/'+n + else: + timezone = n + + filestat = os.lstat(basepath+'/'+timezone) + [filemode] = filestat[:1] + + if (not (stat.S_ISLNK(filemode) or + stat.S_ISREG(filemode) or + stat.S_ISDIR(filemode))): + continue + elif n[:1] >= 'A' and n[:1] <= 'Z': + if stat.S_ISDIR(filemode): + tmptzdata = findtz(basepath, timezone) + else: + tmptzdata = [timezone] + + for m in tmptzdata: + if tzdata == []: + tzdata = [m] + else: + tzdata.append(m) + + tzdata.sort() + + return tzdata diff --git a/iw/lilo.py b/iw/lilo.py index 4666db588..ca9b64f25 100644 --- a/iw/lilo.py +++ b/iw/lilo.py @@ -116,7 +116,7 @@ class LiloWindow (InstallWindow): self.images = self.todo.getLiloImages() self.ignoreSignals = 0 - if '/' not in self.todo.mounts.keys (): return None + if self.todo.fstab.mountList()[0][0] != '/': return None (bootpart, boothd) = self.todo.getLiloOptions() format = "/dev/%s" diff --git a/iw/rootpartition.py b/iw/rootpartition.py index 4618a0f1b..1660ee8ee 100644 --- a/iw/rootpartition.py +++ b/iw/rootpartition.py @@ -61,15 +61,16 @@ class PartitionWindow (InstallWindow): def getNext (self): self.todo.fstab.runDruidFinished() - - if not self.skippedScreen: - win = self.todo.ddruid.getConfirm () - if win: - bin = GtkFrame (None, _obj = win) - bin.set_shadow_type (SHADOW_NONE) - window = ConfirmPartitionWindow - window.window = bin - return window + + # FIXME + #if not self.skippedScreen: + #win = self.todo.ddruid.getConfirm () + #if win: + #bin = GtkFrame (None, _obj = win) + #bin.set_shadow_type (SHADOW_NONE) + #window = ConfirmPartitionWindow + #window.window = bin + #return window bootPartition = None rootPartition = None @@ -83,6 +84,13 @@ class PartitionWindow (InstallWindow): self.ics.setNextEnabled (value) def getScreen (self): + if not self.todo.fstab: + from fstab import GuiFstab + + self.todo.fstab = GuiFstab(self.todo.setupFilesystems, + self.todo.serial, 0, 0, + self.todo.intf.waitWindow) + if self.todo.getSkipPartitioning(): self.skippedScreen = 1 fstab = self.todo.ddruid.getFstab () @@ -127,6 +135,8 @@ class AutoPartitionWindow(InstallWindow): from gnomepyfsedit import fsedit from installpath import InstallPathWindow + return None + if (InstallPathWindow.fdisk and InstallPathWindow.fdisk.get_active ()): self.todo.manuallyPartition() diff --git a/po/anaconda.pot b/po/anaconda.pot index 1af7e0279..23ac43b9a 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-12-07 22:13-0500\n" +"POT-Creation-Date: 1999-12-11 16:03-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" @@ -14,67 +14,109 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../gui.py:283 ../gui.py:529 +#: ../fstab.py:69 ../fstab.py:190 +msgid "Formatting" +msgstr "" + +#: ../fstab.py:70 +#, c-format +msgid "Formatting swap space on /dev/%s..." +msgstr "" + +#: ../fstab.py:132 ../fstab.py:221 ../libfdisk/newtfsedit.c:1540 +#: ../loader/devices.c:178 ../loader/devices.c:183 ../loader/loader.c:471 +#: ../loader/loader.c:481 ../loader/loader.c:697 ../loader/loader.c:742 +#: ../loader/loader.c:880 ../loader/loader.c:885 ../loader/loader.c:1618 +#: ../loader/loader.c:1664 ../loader/loader.c:1735 ../loader/urls.c:206 +#: ../loader/urls.c:211 ../text.py:234 ../text.py:694 ../todo.py:888 +#: ../todo.py:1223 +msgid "Error" +msgstr "" + +#: ../fstab.py:133 +#, c-format +msgid "Error unmounting %s: %s" +msgstr "" + +#: ../fstab.py:144 ../todo.py:531 +msgid "Creating" +msgstr "" + +#: ../fstab.py:144 +msgid "Creating RAID devices..." +msgstr "" + +#: ../fstab.py:191 +#, c-format +msgid "Formatting %s filesystem..." +msgstr "" + +#: ../fstab.py:222 +#, c-format +msgid "Error mounting %s: %s" +msgstr "" + +#: ../gui.py:284 ../gui.py:530 msgid "Next" msgstr "" -#: ../gui.py:284 ../gui.py:528 ../libfdisk/newtfsedit.c:1292 +#: ../gui.py:285 ../gui.py:529 ../libfdisk/newtfsedit.c:1292 #: ../libfdisk/newtfsedit.c:1300 ../loader/cdrom.c:34 ../loader/devices.c:67 #: ../loader/devices.c:168 ../loader/devices.c:218 ../loader/lang.c:537 #: ../loader/loader.c:255 ../loader/loader.c:603 ../loader/loader.c:639 #: ../loader/loader.c:742 ../loader/loader.c:1110 ../loader/net.c:162 -#: ../loader/net.c:284 ../loader/urls.c:129 ../loader/urls.c:341 ../text.py:88 -#: ../text.py:89 ../text.py:108 ../text.py:131 ../text.py:161 ../text.py:164 -#: ../text.py:206 ../text.py:235 ../text.py:249 ../text.py:251 ../text.py:270 -#: ../text.py:272 ../text.py:294 ../text.py:296 ../text.py:385 ../text.py:436 -#: ../text.py:438 ../text.py:447 ../text.py:465 ../text.py:478 ../text.py:515 -#: ../text.py:517 ../text.py:543 ../text.py:546 ../text.py:555 ../text.py:613 -#: ../text.py:614 ../text.py:926 ../text.py:949 ../textw/constants.py:10 -#: ../textw/lilo.py:27 ../textw/lilo.py:77 ../textw/lilo.py:84 -#: ../textw/lilo.py:159 ../textw/packages.py:20 ../textw/packages.py:85 -#: ../textw/packages.py:136 ../textw/packages.py:145 -#: ../textw/partitioning.py:24 ../textw/partitioning.py:65 -#: ../textw/partitioning.py:205 ../textw/silo.py:26 ../textw/silo.py:86 -#: ../textw/silo.py:185 ../textw/userauth.py:29 ../textw/userauth.py:141 +#: ../loader/net.c:284 ../loader/urls.c:129 ../loader/urls.c:341 ../text.py:90 +#: ../text.py:91 ../text.py:110 ../text.py:133 ../text.py:163 ../text.py:166 +#: ../text.py:208 ../text.py:237 ../text.py:251 ../text.py:253 ../text.py:272 +#: ../text.py:274 ../text.py:296 ../text.py:298 ../text.py:387 ../text.py:438 +#: ../text.py:440 ../text.py:449 ../text.py:467 ../text.py:480 ../text.py:517 +#: ../text.py:519 ../text.py:545 ../text.py:548 ../text.py:557 ../text.py:615 +#: ../text.py:616 ../textw/constants.py:10 ../textw/lilo.py:27 +#: ../textw/lilo.py:78 ../textw/lilo.py:85 ../textw/lilo.py:160 +#: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 +#: ../textw/packages.py:145 ../textw/partitioning.py:23 +#: ../textw/partitioning.py:64 ../textw/partitioning.py:199 +#: ../textw/silo.py:26 ../textw/silo.py:86 ../textw/silo.py:185 +#: ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:141 #: ../textw/userauth.py:172 ../textw/userauth.py:244 msgid "Back" msgstr "" -#: ../gui.py:285 ../gui.py:533 +#: ../gui.py:286 ../gui.py:534 msgid "Show Help" msgstr "" -#: ../gui.py:286 ../gui.py:532 +#: ../gui.py:287 ../gui.py:533 msgid "Hide Help" msgstr "" -#: ../gui.py:287 ../gui.py:531 +#: ../gui.py:288 ../gui.py:532 msgid "Finish" msgstr "" -#: ../gui.py:290 ../gui.py:555 +#: ../gui.py:291 ../gui.py:556 msgid "Online Help" msgstr "" -#: ../gui.py:291 ../iw/language.py:10 ../text.py:50 ../text.py:1038 -#: ../text.py:1067 +#: ../gui.py:292 ../iw/language.py:10 ../text.py:52 ../text.py:934 +#: ../text.py:963 msgid "Language Selection" msgstr "" -#: ../gui.py:495 +#: ../gui.py:496 msgid "Red Hat Linux Installer" msgstr "" -#: ../gui.py:499 +#: ../gui.py:500 msgid "Red Hat Linux Install Shell" msgstr "" -#: ../gui.py:510 +#: ../gui.py:511 #, c-format msgid "Red Hat Linux Installer on %s" msgstr "" -#: ../gui.py:511 +#: ../gui.py:512 #, c-format msgid "Red Hat Linux Install Shell on %s" msgstr "" @@ -90,7 +132,7 @@ msgid "" "Linux installation." msgstr "" -#: ../text.py:51 +#: ../text.py:53 msgid "What language would you like to use during the installation process?" msgstr "" @@ -104,42 +146,42 @@ msgstr "" #: ../loader/loader.c:1618 ../loader/loader.c:1664 ../loader/loader.c:1727 #: ../loader/loader.c:1735 ../loader/net.c:162 ../loader/net.c:284 #: ../loader/net.c:557 ../loader/urls.c:129 ../loader/urls.c:206 -#: ../loader/urls.c:211 ../loader/urls.c:341 ../text.py:53 ../text.py:108 -#: ../text.py:161 ../text.py:206 ../text.py:249 ../text.py:294 ../text.py:385 -#: ../text.py:405 ../text.py:436 ../text.py:515 ../text.py:543 ../text.py:613 -#: ../text.py:637 ../text.py:651 ../text.py:671 ../text.py:684 ../text.py:696 -#: ../text.py:926 ../text.py:999 ../text.py:1003 ../text.py:1191 -#: ../textw/lilo.py:26 ../textw/lilo.py:77 ../textw/packages.py:20 -#: ../textw/packages.py:85 ../textw/packages.py:136 -#: ../textw/partitioning.py:205 ../textw/silo.py:25 ../textw/silo.py:86 -#: ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48 -#: ../textw/userauth.py:82 ../textw/userauth.py:94 ../textw/userauth.py:102 -#: ../textw/userauth.py:111 ../textw/userauth.py:172 ../textw/userauth.py:244 +#: ../loader/urls.c:211 ../loader/urls.c:341 ../text.py:55 ../text.py:110 +#: ../text.py:163 ../text.py:208 ../text.py:251 ../text.py:296 ../text.py:387 +#: ../text.py:407 ../text.py:438 ../text.py:517 ../text.py:545 ../text.py:615 +#: ../text.py:639 ../text.py:653 ../text.py:673 ../text.py:686 ../text.py:698 +#: ../text.py:893 ../text.py:897 ../text.py:1087 ../textw/lilo.py:26 +#: ../textw/lilo.py:78 ../textw/packages.py:20 ../textw/packages.py:85 +#: ../textw/packages.py:136 ../textw/partitioning.py:199 ../textw/silo.py:25 +#: ../textw/silo.py:86 ../textw/timezone.py:63 ../textw/userauth.py:29 +#: ../textw/userauth.py:43 ../textw/userauth.py:48 ../textw/userauth.py:82 +#: ../textw/userauth.py:94 ../textw/userauth.py:102 ../textw/userauth.py:111 +#: ../textw/userauth.py:172 ../textw/userauth.py:244 msgid "OK" msgstr "" -#: ../text.py:68 +#: ../text.py:70 msgid "/dev/ttyS0 (COM1 under DOS)" msgstr "" -#: ../text.py:69 +#: ../text.py:71 msgid "/dev/ttyS1 (COM2 under DOS)" msgstr "" -#: ../text.py:70 +#: ../text.py:72 msgid "/dev/ttyS2 (COM3 under DOS)" msgstr "" -#: ../text.py:71 +#: ../text.py:73 msgid "/dev/ttyS3 (COM4 under DOS)" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../text.py:86 ../textw/lilo.py:90 -#: ../textw/lilo.py:149 ../textw/silo.py:118 ../textw/silo.py:175 +#: ../iw/lilo.py:180 ../iw/silo.py:245 ../text.py:88 ../textw/lilo.py:91 +#: ../textw/lilo.py:150 ../textw/silo.py:118 ../textw/silo.py:175 msgid "Device" msgstr "" -#: ../text.py:87 +#: ../text.py:89 #, c-format msgid "What device is your mouse located on? %s %i" msgstr "" @@ -161,88 +203,78 @@ msgstr "" #: ../libfdisk/newtfsedit.c:558 ../libfdisk/newtfsedit.c:576 #: ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 #: ../libfdisk/newtfsedit.c:1425 ../libfdisk/newtfsedit.c:1446 -#: ../libfdisk/newtfsedit.c:1540 ../loader/urls.c:217 ../text.py:88 -#: ../text.py:555 ../textw/constants.py:10 ../textw/lilo.py:95 -#: ../textw/lilo.py:108 ../textw/lilo.py:158 ../textw/silo.py:123 +#: ../libfdisk/newtfsedit.c:1540 ../loader/urls.c:217 ../text.py:90 +#: ../text.py:557 ../textw/constants.py:10 ../textw/lilo.py:96 +#: ../textw/lilo.py:109 ../textw/lilo.py:159 ../textw/silo.py:123 #: ../textw/silo.py:136 ../textw/silo.py:184 msgid "Ok" msgstr "" -#: ../text.py:110 +#: ../text.py:112 msgid "Which model mouse is attached to this computer?" msgstr "" -#: ../text.py:119 +#: ../text.py:121 msgid "Emulate 3 Buttons?" msgstr "" -#: ../text.py:121 +#: ../text.py:123 msgid "Mouse Selection" msgstr "" -#: ../text.py:159 ../text.py:1040 ../text.py:1069 +#: ../text.py:161 ../text.py:936 ../text.py:965 msgid "Keyboard Selection" msgstr "" -#: ../text.py:160 +#: ../text.py:162 msgid "Which model keyboard is attached to this computer?" msgstr "" -#: ../text.py:199 +#: ../text.py:201 msgid "Install GNOME Workstation" msgstr "" -#: ../text.py:200 +#: ../text.py:202 msgid "Install KDE Workstation" msgstr "" -#: ../text.py:201 +#: ../text.py:203 msgid "Install Server System" msgstr "" -#: ../text.py:202 +#: ../text.py:204 msgid "Install Custom System" msgstr "" -#: ../text.py:203 +#: ../text.py:205 msgid "Upgrade Existing Installation" msgstr "" -#: ../text.py:204 ../text.py:1072 +#: ../text.py:206 ../text.py:968 msgid "Installation Type" msgstr "" -#: ../text.py:205 +#: ../text.py:207 msgid "What type of system would you like to install?" msgstr "" -#: ../libfdisk/newtfsedit.c:1540 ../loader/devices.c:178 -#: ../loader/devices.c:183 ../loader/loader.c:471 ../loader/loader.c:481 -#: ../loader/loader.c:697 ../loader/loader.c:742 ../loader/loader.c:880 -#: ../loader/loader.c:885 ../loader/loader.c:1618 ../loader/loader.c:1664 -#: ../loader/loader.c:1735 ../loader/urls.c:206 ../loader/urls.c:211 -#: ../text.py:232 ../text.py:692 ../todo.py:369 ../todo.py:509 ../todo.py:1084 -#: ../todo.py:1421 -msgid "Error" -msgstr "" - -#: ../text.py:233 +#: ../text.py:235 msgid "You don't have any Linux partitions. You can't upgrade this system!" msgstr "" -#: ../text.py:246 +#: ../text.py:248 msgid "System to Upgrade" msgstr "" -#: ../text.py:247 +#: ../text.py:249 msgid "What partition holds the root partition of your installation?" msgstr "" -#: ../text.py:262 +#: ../text.py:264 msgid "Customize Packages to Upgrade" msgstr "" -#: ../text.py:263 +#: ../text.py:265 msgid "" "The packages you have installed, and any other packages which are needed to " "satisfy their dependencies, have been selected for installation. Would you " @@ -255,8 +287,8 @@ msgstr "" #: ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 #: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 #: ../libfdisk/newtfsedit.c:1581 ../loader/loader.c:603 ../loader/net.c:703 -#: ../text.py:270 ../text.py:447 ../text.py:465 ../text.py:472 -#: ../textw/partitioning.py:168 +#: ../text.py:272 ../text.py:449 ../text.py:467 ../text.py:474 +#: ../textw/partitioning.py:164 msgid "Yes" msgstr "" @@ -265,17 +297,17 @@ msgstr "" #: ../libfdisk/gnomefsedit.c:2309 ../libfdisk/gnomefsedit.c:2362 #: ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 #: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 -#: ../libfdisk/newtfsedit.c:1581 ../loader/net.c:703 ../text.py:270 -#: ../text.py:275 ../text.py:447 ../text.py:465 ../text.py:475 -#: ../textw/partitioning.py:168 +#: ../libfdisk/newtfsedit.c:1581 ../loader/net.c:703 ../text.py:272 +#: ../text.py:277 ../text.py:449 ../text.py:467 ../text.py:477 +#: ../textw/partitioning.py:164 msgid "No" msgstr "" -#: ../text.py:285 +#: ../text.py:287 msgid "Red Hat Linux" msgstr "" -#: ../text.py:286 +#: ../text.py:288 msgid "" "Welcome to Red Hat Linux!\n" "\n" @@ -287,53 +319,53 @@ msgid "" "purchase through our web site, http://www.redhat.com/." msgstr "" -#: ../text.py:357 +#: ../text.py:359 msgid "Use bootp/dhcp" msgstr "" -#: ../loader/net.c:234 ../text.py:362 +#: ../loader/net.c:234 ../text.py:364 msgid "IP address:" msgstr "" -#: ../loader/net.c:237 ../text.py:363 +#: ../loader/net.c:237 ../text.py:365 msgid "Netmask:" msgstr "" -#: ../loader/net.c:240 ../text.py:364 +#: ../loader/net.c:240 ../text.py:366 msgid "Default gateway (IP):" msgstr "" -#: ../loader/net.c:243 ../text.py:365 +#: ../loader/net.c:243 ../text.py:367 msgid "Primary nameserver:" msgstr "" -#: ../iw/network.py:11 ../text.py:387 +#: ../iw/network.py:11 ../text.py:389 msgid "Network Configuration" msgstr "" -#: ../text.py:403 +#: ../text.py:405 msgid "Invalid information" msgstr "" -#: ../text.py:404 +#: ../text.py:406 msgid "You must enter valid IP information to continue" msgstr "" -#: ../text.py:432 +#: ../text.py:434 msgid "Hostname Configuration" msgstr "" -#: ../text.py:433 +#: ../text.py:435 msgid "" "The hostname is the name of your computer. If your computer is attached to " "a network, this may be assigned by your network administrator." msgstr "" -#: ../iw/network.py:210 ../loader/net.c:458 ../loader/net.c:622 ../text.py:436 +#: ../iw/network.py:210 ../loader/net.c:458 ../loader/net.c:622 ../text.py:438 msgid "Hostname" msgstr "" -#: ../text.py:448 +#: ../text.py:450 msgid "" "A custom boot disk provides a way of booting into your Linux system without " "depending on the normal bootloader. This is useful if you don't want to " @@ -345,56 +377,56 @@ msgid "" "Would you like to create a boot disk for your system?" msgstr "" -#: ../text.py:467 +#: ../text.py:469 msgid "" "\n" "On SMCC made Ultra machines floppy booting probably does not work\n" "\n" msgstr "" -#: ../text.py:470 ../text.py:680 +#: ../text.py:472 ../text.py:682 msgid "Bootdisk" msgstr "" -#: ../text.py:513 +#: ../text.py:515 msgid "X probe results" msgstr "" -#: ../text.py:532 ../text.py:551 +#: ../text.py:534 ../text.py:553 msgid "Unlisted Card" msgstr "" -#: ../text.py:540 +#: ../text.py:542 msgid "Video Card Selection" msgstr "" -#: ../text.py:541 +#: ../text.py:543 msgid "Which video card do you have?" msgstr "" -#: ../text.py:553 +#: ../text.py:555 msgid "X Server Selection" msgstr "" -#: ../text.py:553 +#: ../text.py:555 msgid "Choose a server" msgstr "" -#: ../text.py:609 +#: ../text.py:611 msgid "Installation to begin" msgstr "" -#: ../iw/confirm.py:30 ../text.py:610 +#: ../iw/confirm.py:30 ../text.py:612 msgid "" "A complete log of your installation will be in /tmp/install.log after " "rebooting your system. You may want to keep this file for later reference." msgstr "" -#: ../text.py:627 ../text.py:641 ../text.py:661 +#: ../text.py:629 ../text.py:643 ../text.py:663 msgid "Complete" msgstr "" -#: ../iw/congrats.py:31 ../text.py:628 +#: ../iw/congrats.py:31 ../text.py:630 msgid "" "Congratulations, installation is complete.\n" "\n" @@ -406,7 +438,7 @@ msgid "" "chapter of the Official Red Hat Linux User's Guide." msgstr "" -#: ../text.py:642 ../text.py:662 +#: ../text.py:644 ../text.py:664 msgid "" "Congratulations, configuration is complete.\n" "\n" @@ -417,330 +449,289 @@ msgid "" "install chapter of the Official Red Hat Linux User's Guide." msgstr "" -#: ../iw/bootdisk.py:50 ../text.py:681 +#: ../iw/bootdisk.py:50 ../text.py:683 msgid "" "Insert a blank floppy in the first floppy drive. All data on this disk will " "be erased during creation of the boot disk." msgstr "" -#: ../text.py:684 ../text.py:685 ../text.py:696 ../text.py:697 +#: ../text.py:686 ../text.py:687 ../text.py:698 ../text.py:699 #: ../textw/lilo.py:26 ../textw/silo.py:25 msgid "Skip" msgstr "" -#: ../iw/bootdisk.py:54 ../text.py:693 +#: ../iw/bootdisk.py:54 ../text.py:695 msgid "" "An error occured while making the boot disk. Please make sure that there is " "a formatted floppy in the first floppy drive." msgstr "" -#: ../text.py:755 +#: ../text.py:757 msgid "Package Installation" msgstr "" -#: ../text.py:757 +#: ../text.py:759 msgid "Name : " msgstr "" -#: ../text.py:758 +#: ../text.py:760 msgid "Size : " msgstr "" -#: ../text.py:759 +#: ../text.py:761 msgid "Summary: " msgstr "" -#: ../text.py:785 +#: ../text.py:787 msgid " Packages" msgstr "" -#: ../text.py:786 +#: ../text.py:788 msgid " Bytes" msgstr "" -#: ../text.py:787 +#: ../text.py:789 msgid " Time" msgstr "" -#: ../text.py:789 +#: ../text.py:791 msgid "Total :" msgstr "" -#: ../text.py:796 +#: ../text.py:798 msgid "Completed: " msgstr "" -#: ../text.py:806 +#: ../text.py:808 msgid "Remaining: " msgstr "" -#: ../text.py:928 -msgid "What time zone are you located in?" -msgstr "" - -#: ../text.py:937 -msgid "Hardware clock set to GMT?" -msgstr "" - -#: ../iw/timezone.py:30 ../text.py:939 -msgid "Time Zone Selection" -msgstr "" - -#: ../text.py:1003 ../text.py:1004 +#: ../text.py:897 ../text.py:898 msgid "Debug" msgstr "" -#: ../text.py:1016 +#: ../text.py:910 msgid "Red Hat Linux (C) 1999 Red Hat, Inc." msgstr "" -#: ../text.py:1018 +#: ../text.py:912 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../text.py:1042 ../text.py:1108 +#: ../text.py:938 ../text.py:1004 msgid "Hostname Setup" msgstr "" -#: ../text.py:1044 ../text.py:1110 +#: ../text.py:940 ../text.py:1006 msgid "Network Setup" msgstr "" -#: ../text.py:1050 ../text.py:1116 +#: ../text.py:946 ../text.py:1012 msgid "Time Zone Setup" msgstr "" -#: ../text.py:1052 ../text.py:1118 ../textw/userauth.py:8 +#: ../text.py:948 ../text.py:1014 ../textw/userauth.py:8 msgid "Root Password" msgstr "" -#: ../text.py:1054 ../text.py:1120 ../textw/userauth.py:148 +#: ../text.py:950 ../text.py:1016 ../textw/userauth.py:148 msgid "User Account Setup" msgstr "" -#: ../text.py:1056 ../text.py:1122 +#: ../text.py:952 ../text.py:1018 msgid "Authentication" msgstr "" -#: ../text.py:1062 +#: ../text.py:958 msgid "Configuration Complete" msgstr "" -#: ../iw/welcome.py:10 ../text.py:1071 +#: ../iw/welcome.py:10 ../text.py:967 msgid "Welcome" msgstr "" -#: ../text.py:1080 ../textw/silo.py:28 ../textw/silo.py:88 -#: ../textw/silo.py:192 +#: ../text.py:976 ../textw/silo.py:28 ../textw/silo.py:88 ../textw/silo.py:192 msgid "SILO Configuration" msgstr "" -#: ../text.py:1086 ../textw/lilo.py:29 ../textw/lilo.py:74 -#: ../textw/lilo.py:167 +#: ../text.py:982 ../textw/lilo.py:29 ../textw/lilo.py:75 ../textw/lilo.py:168 msgid "LILO Configuration" msgstr "" #: ../iw/lilo.py:97 ../iw/lilo.py:202 ../iw/silo.py:125 ../iw/silo.py:268 -#: ../text.py:1090 ../text.py:1096 +#: ../text.py:986 ../text.py:992 msgid "Partition" msgstr "" -#: ../text.py:1092 +#: ../text.py:988 msgid "Manually Partition" msgstr "" -#: ../text.py:1094 +#: ../text.py:990 msgid "Automatic Partition" msgstr "" -#: ../text.py:1098 +#: ../text.py:994 msgid "Swap" msgstr "" -#: ../text.py:1100 +#: ../text.py:996 msgid "Filesystem Formatting" msgstr "" -#: ../iw/mouse.py:55 ../text.py:1112 ../text.py:1114 +#: ../iw/mouse.py:55 ../text.py:1008 ../text.py:1010 msgid "Mouse Configuration" msgstr "" -#: ../text.py:1124 +#: ../text.py:1020 msgid "Package Groups" msgstr "" -#: ../text.py:1126 ../text.py:1153 +#: ../text.py:1022 ../text.py:1049 msgid "Individual Packages" msgstr "" -#: ../text.py:1128 ../textw/packages.py:114 +#: ../text.py:1024 ../textw/packages.py:114 msgid "Package Dependencies" msgstr "" -#: ../iw/xconfig.py:120 ../text.py:1130 ../text.py:1138 +#: ../iw/xconfig.py:120 ../text.py:1026 ../text.py:1034 msgid "X Configuration" msgstr "" -#: ../text.py:1132 ../text.py:1137 ../text.py:1154 ../text.py:1157 +#: ../text.py:1028 ../text.py:1033 ../text.py:1050 ../text.py:1053 msgid "Boot Disk" msgstr "" -#: ../text.py:1134 +#: ../text.py:1030 msgid "Installation Begins" msgstr "" -#: ../text.py:1136 +#: ../text.py:1032 msgid "Install System" msgstr "" -#: ../text.py:1140 +#: ../text.py:1036 msgid "Installation Complete" msgstr "" -#: ../text.py:1145 +#: ../text.py:1041 msgid "Examine System" msgstr "" -#: ../text.py:1152 +#: ../text.py:1048 msgid "Customize Upgrade" msgstr "" -#: ../text.py:1156 +#: ../text.py:1052 msgid "Upgrade System" msgstr "" -#: ../text.py:1158 +#: ../text.py:1054 msgid "Upgrade Complete" msgstr "" -#: ../text.py:1188 +#: ../text.py:1084 msgid "Cancelled" msgstr "" -#: ../text.py:1189 +#: ../text.py:1085 msgid "I can't go to the previous step from here. You will have to try again." msgstr "" -#: ../todo.py:370 -#, c-format -msgid "Error unmounting %s: %s" -msgstr "" - -#: ../todo.py:510 -#, c-format -msgid "Error mounting %s: %s" -msgstr "" - -#: ../todo.py:529 ../todo.py:727 -msgid "Creating" -msgstr "" - -#: ../todo.py:530 -msgid "Creating RAID devices..." -msgstr "" - -#: ../todo.py:579 ../todo.py:592 -msgid "Formatting" -msgstr "" - -#: ../todo.py:580 ../todo.py:593 -#, c-format -msgid "Formatting %s filesystem..." -msgstr "" - -#: ../todo.py:727 +#: ../todo.py:531 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:872 +#: ../todo.py:676 msgid "Reading" msgstr "" -#: ../todo.py:873 +#: ../todo.py:677 msgid "Reading package information..." msgstr "" -#: ../todo.py:1041 ../todo.py:1051 +#: ../todo.py:845 ../todo.py:855 msgid "no suggestion" msgstr "" -#: ../todo.py:1057 +#: ../todo.py:861 msgid "Searching" msgstr "" -#: ../todo.py:1058 +#: ../todo.py:862 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:1085 +#: ../todo.py:889 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:1104 +#: ../todo.py:908 msgid "Finding" msgstr "" -#: ../todo.py:1105 +#: ../todo.py:909 msgid "Finding packages to upgrade..." msgstr "" -#: ../todo.py:1301 +#: ../todo.py:1101 msgid "Processing" msgstr "" -#: ../todo.py:1302 +#: ../todo.py:1102 msgid "Preparing to install..." msgstr "" -#: ../todo.py:1416 +#: ../todo.py:1218 msgid "Rebuilding" msgstr "" -#: ../todo.py:1417 +#: ../todo.py:1219 msgid "Rebuilding RPM database..." msgstr "" -#: ../todo.py:1422 +#: ../todo.py:1224 msgid "Rebuild of RPM database failed. You may be out of disk space?" msgstr "" -#: ../todo.py:1472 +#: ../todo.py:1274 #, c-format msgid "Upgrading %s.\n" msgstr "" -#: ../todo.py:1474 +#: ../todo.py:1276 #, c-format msgid "Installing %s.\n" msgstr "" -#: ../todo.py:1495 +#: ../todo.py:1297 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:1498 +#: ../todo.py:1300 msgid "Mount Point" msgstr "" -#: ../todo.py:1498 +#: ../todo.py:1300 msgid "Space Needed" msgstr "" -#: ../todo.py:1512 +#: ../todo.py:1314 msgid "Disk Space" msgstr "" -#: ../todo.py:1535 +#: ../todo.py:1337 msgid "Post Install" msgstr "" -#: ../todo.py:1536 +#: ../todo.py:1338 msgid "Performing post install configuration..." msgstr "" @@ -810,8 +801,8 @@ msgid "Add" msgstr "" #: ../iw/account.py:207 ../libfdisk/newtfsedit.c:1291 -#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:158 ../textw/lilo.py:180 -#: ../textw/partitioning.py:64 ../textw/silo.py:184 ../textw/silo.py:206 +#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:159 ../textw/lilo.py:181 +#: ../textw/partitioning.py:63 ../textw/silo.py:184 ../textw/silo.py:206 #: ../textw/userauth.py:172 msgid "Edit" msgstr "" @@ -918,7 +909,7 @@ msgstr "" msgid "Customize packages to be upgraded" msgstr "" -#: ../iw/fdisk.py:12 ../textw/partitioning.py:23 +#: ../iw/fdisk.py:12 ../textw/partitioning.py:22 msgid "fdisk" msgstr "" @@ -930,7 +921,7 @@ msgstr "" msgid "Choose partitions to Format" msgstr "" -#: ../iw/format.py:47 +#: ../iw/format.py:43 msgid "Check for bad blocks while formatting" msgstr "" @@ -963,7 +954,7 @@ msgstr "" msgid "Upgrade" msgstr "" -#: ../iw/installpath.py:217 +#: ../iw/installpath.py:216 msgid "Use fdisk" msgstr "" @@ -1027,18 +1018,18 @@ msgstr "" msgid "Do not install LILO" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:149 +#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:150 #: ../textw/silo.py:175 msgid "Default" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:149 +#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:150 #: ../textw/silo.py:175 msgid "Partition type" msgstr "" #: ../iw/lilo.py:180 ../iw/lilo.py:214 ../iw/silo.py:245 ../iw/silo.py:280 -#: ../textw/lilo.py:91 ../textw/lilo.py:149 ../textw/silo.py:119 +#: ../textw/lilo.py:92 ../textw/lilo.py:150 ../textw/silo.py:119 #: ../textw/silo.py:175 msgid "Boot label" msgstr "" @@ -1159,26 +1150,26 @@ msgstr "" msgid "Confirm Partitioning Selection" msgstr "" -#: ../iw/rootpartition.py:32 ../textw/partitioning.py:23 +#: ../iw/rootpartition.py:32 ../textw/partitioning.py:22 msgid "Disk Druid" msgstr "" -#: ../iw/rootpartition.py:43 ../textw/partitioning.py:163 +#: ../iw/rootpartition.py:43 ../textw/partitioning.py:159 msgid "Low Memory" msgstr "" -#: ../iw/rootpartition.py:44 ../textw/partitioning.py:164 +#: ../iw/rootpartition.py:44 ../textw/partitioning.py:160 msgid "" "As you don't have much memory in this machine, we need to turn on swap space " "immediately. To do this we'll have to write your new partition table to the " "disk immediately. Is that okay?" msgstr "" -#: ../iw/rootpartition.py:143 ../textw/partitioning.py:126 +#: ../iw/rootpartition.py:117 ../textw/partitioning.py:126 msgid "Automatic Partitioning" msgstr "" -#: ../iw/rootpartition.py:191 ../textw/partitioning.py:127 +#: ../iw/rootpartition.py:167 ../textw/partitioning.py:127 #, c-format msgid "" "%s\n" @@ -1188,11 +1179,11 @@ msgid "" "installation." msgstr "" -#: ../iw/rootpartition.py:205 +#: ../iw/rootpartition.py:181 msgid "Remove data" msgstr "" -#: ../iw/rootpartition.py:208 ../textw/partitioning.py:131 +#: ../iw/rootpartition.py:184 ../textw/partitioning.py:131 msgid "Manually partition" msgstr "" @@ -1216,6 +1207,10 @@ msgstr "" msgid "Do not install SILO" msgstr "" +#: ../iw/timezone.py:30 ../textw/timezone.py:80 +msgid "Time Zone Selection" +msgstr "" + #: ../iw/timezone.py:154 msgid "View:" msgstr "" @@ -1291,11 +1286,11 @@ msgid "" "blank." msgstr "" -#: ../textw/lilo.py:75 ../textw/silo.py:90 +#: ../textw/lilo.py:76 ../textw/silo.py:90 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../textw/lilo.py:95 ../textw/lilo.py:116 ../textw/silo.py:123 +#: ../textw/lilo.py:96 ../textw/lilo.py:117 ../textw/silo.py:123 #: ../textw/silo.py:144 msgid "Clear" msgstr "" @@ -1303,16 +1298,16 @@ msgstr "" #: ../libfdisk/gnomefsedit.c:679 ../libfdisk/gnomefsedit.c:1648 #: ../libfdisk/gnomefsedit.c:2147 ../libfdisk/newtfsedit.c:463 #: ../libfdisk/newtfsedit.c:1496 ../loader/devices.c:168 -#: ../loader/loader.c:1727 ../textw/lilo.py:95 ../textw/lilo.py:113 +#: ../loader/loader.c:1727 ../textw/lilo.py:96 ../textw/lilo.py:114 #: ../textw/silo.py:123 ../textw/silo.py:141 ../textw/userauth.py:62 msgid "Cancel" msgstr "" -#: ../textw/lilo.py:103 ../textw/silo.py:131 +#: ../textw/lilo.py:104 ../textw/silo.py:131 msgid "Edit Boot Label" msgstr "" -#: ../textw/lilo.py:162 ../textw/silo.py:187 +#: ../textw/lilo.py:163 ../textw/silo.py:187 msgid "" "The boot manager Red Hat uses can boot other operating systems as well. You " "need to tell me what partitions you would like to be able to boot and what " @@ -1326,11 +1321,11 @@ msgid "" "installed." msgstr "" -#: ../textw/partitioning.py:15 ../textw/partitioning.py:58 +#: ../textw/partitioning.py:14 ../textw/partitioning.py:57 msgid "Disk Setup" msgstr "" -#: ../textw/partitioning.py:16 +#: ../textw/partitioning.py:15 msgid "" "Disk Druid is a tool for partitioning and setting up mount points. It is " "designed to be easier to use than Linux's traditional disk partitioning " @@ -1340,14 +1335,14 @@ msgid "" "Which tool would you like to use?" msgstr "" -#: ../textw/partitioning.py:59 +#: ../textw/partitioning.py:58 msgid "" "To install Red Hat Linux, you must have at least one partition of 150 MB " "dedicated to Linux. We suggest placing that partition on one of the first " "two hard drives in your system so you can boot into Linux with LILO." msgstr "" -#: ../loader/loader.c:303 ../loader/loader.c:328 ../textw/partitioning.py:64 +#: ../loader/loader.c:303 ../loader/loader.c:328 ../textw/partitioning.py:63 msgid "Done" msgstr "" @@ -1355,7 +1350,7 @@ msgstr "" msgid "Continue" msgstr "" -#: ../textw/partitioning.py:183 +#: ../textw/partitioning.py:179 msgid "" "What partitions would you like to format? We strongly suggest formatting all " "of the system partitions, including /, /usr, and /var. There is no need to " @@ -1363,11 +1358,11 @@ msgid "" "previous install." msgstr "" -#: ../textw/partitioning.py:203 +#: ../textw/partitioning.py:196 msgid "Check for bad blocks during format" msgstr "" -#: ../textw/partitioning.py:207 +#: ../textw/partitioning.py:201 msgid "Choose Partitions to Format" msgstr "" @@ -1379,6 +1374,14 @@ msgstr "" msgid "Set default PROM boot device" msgstr "" +#: ../textw/timezone.py:65 +msgid "What time zone are you located in?" +msgstr "" + +#: ../textw/timezone.py:77 +msgid "Hardware clock set to GMT?" +msgstr "" + #: ../textw/userauth.py:10 msgid "" "Pick a root password. You must type it twice to ensure you know what it is " @@ -34,6 +34,7 @@ from textw.partitioning import FormatWindow from textw.packages import PackageGroupWindow from textw.packages import IndividualPackageWindow from textw.packages import PackageDepWindow +from textw.timezone import TimezoneWindow import installclass class LanguageWindow: @@ -846,114 +847,6 @@ class WaitWindow: g.draw() self.screen.refresh() - -# -# do these belong here or should they be made nested functions in -# the TimeZoneWindow below, or perhaps put in a utility module? -# -def makerelname(relpath, filename): - if relpath != '': - return relpath+'/'+filename - else: - return filename - - -def findtz(basepath, relpath): - tzdata = [] - for n in os.listdir(basepath+'/'+relpath): - timezone = makerelname(relpath, n) - if relpath != '': - timezone = relpath+'/'+n - else: - timezone = n - - filestat = os.lstat(basepath+'/'+timezone) - [filemode] = filestat[:1] - - if (not (stat.S_ISLNK(filemode) or - stat.S_ISREG(filemode) or - stat.S_ISDIR(filemode))): - continue - elif n[:1] >= 'A' and n[:1] <= 'Z': - if stat.S_ISDIR(filemode): - tmptzdata = findtz(basepath, timezone) - else: - tmptzdata = [timezone] - - for m in tmptzdata: - if tzdata == []: - tzdata = [m] - else: - tzdata.append(m) - - tzdata.sort() - - return tzdata - - -class TimezoneWindow: - - def getTimezoneList(self, test): - if not os.access("/usr/lib/timezones.gz", os.R_OK): - if test: - cmd = "./gettzlist" - stdin = None - else: - zoneList = findtz('/usr/share/zoneinfo', '') - cmd = "" - stdin = None - else: - cmd = "/usr/bin/gunzip" - stdin = os.open("/usr/lib/timezones.gz", 0) - - if cmd != "": - zones = iutil.execWithCapture(cmd, [ cmd ], stdin = stdin) - zoneList = string.split(zones) - - if (stdin != None): - os.close(stdin) - - return zoneList - - def __call__(self, screen, todo, test): - timezones = self.getTimezoneList(test) - rc = todo.getTimezoneInfo() - if rc: - (default, asUtc, asArc) = rc - else: - default = "US/Eastern" - asUtc = 0 - - bb = ButtonBar(screen, [_("OK"), _("Back")]) - t = TextboxReflowed(30, - _("What time zone are you located in?")) - - l = Listbox(8, scroll = 1, returnExit = 0) - - for tz in timezones: - l.append(tz, tz) - - l.setCurrent(default) - - c = Checkbox(_("Hardware clock set to GMT?"), isOn = asUtc) - - g = GridForm(screen, _("Time Zone Selection"), 1, 4) - g.add(t, 0, 0) - g.add(c, 0, 1, padding = (0, 1, 0, 1), anchorLeft = 1) - g.add(l, 0, 2, padding = (0, 0, 0, 1)) - g.add(bb, 0, 3, growx = 1) - - rc = g.runOnce() - - button = bb.buttonPressed(rc) - - if button == string.lower (_("Back")): - return INSTALL_BACK - - todo.setTimezoneInfo(l.current(), asUtc = c.selected()) - - return INSTALL_OK - class Flag: """a quick mutable boolean class""" def __init__(self, value = 0): @@ -1340,7 +1340,7 @@ class ToDo: if not self.upgrade: self.createCdrom() self.copyExtraModules() - self.findFdDevice() + self.setFdDevice() self.fstab.write (self.instPath, fdDevice = self.fdDevice) self.writeConfiguration () self.writeDesktop () |