diff options
| -rw-r--r-- | iw/network.py | 3 | ||||
| -rw-r--r-- | po/anaconda.pot | 292 | ||||
| -rw-r--r-- | text.py | 1 | ||||
| -rw-r--r-- | todo.py | 109 |
4 files changed, 191 insertions, 214 deletions
diff --git a/iw/network.py b/iw/network.py index e4135a3bc..e254c04f8 100644 --- a/iw/network.py +++ b/iw/network.py @@ -34,7 +34,6 @@ class NetworkWindow (InstallWindow): ip.calcNMHandler = ip.connect ("changed", self.calcNetmask, (ip, nm)) def focusOutIP (self, widget, event, ip): - self.todo.network.guessHostnames () if (self.hostname.get_text () == "" and self.todo.network.hostname != "localhost.localdomain"): self.hostname.set_text (self.todo.network.hostname) @@ -85,7 +84,6 @@ class NetworkWindow (InstallWindow): ("network", network), ("broadcast", broadcast), ("onboot", "yes")) self.todo.network.gateway = self.gw.get_text () self.todo.network.primaryNS = self.dns1.get_text () - self.todo.network.guessHostnames () except: pass @@ -190,7 +188,6 @@ class NetworkWindow (InstallWindow): options[t].connect ("changed", self.calcNWBC, (devs[i],) + tuple (options)) self.focusOutNM (None, None, (devs[i],) + tuple (options)) - self.todo.network.guessHostnames () # add event handlers for the main IP widget to calcuate the netmask options[0].connect ("focus_in_event", self.focusInIP, (options[0], options[1])) diff --git a/po/anaconda.pot b/po/anaconda.pot index 9a7ca7b22..af9cb69e1 100644 --- a/po/anaconda.pot +++ b/po/anaconda.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-02-16 14:35-0500\n" +"POT-Creation-Date: 2000-02-17 15:22-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" @@ -30,8 +30,8 @@ msgstr "" #: ../loader/loader.c:910 ../loader/loader.c:915 ../loader/loader.c:1692 #: ../loader/loader.c:1738 ../loader/loader.c:1809 ../loader/urls.c:70 #: ../loader/urls.c:79 ../loader/urls.c:86 ../loader/urls.c:223 -#: ../loader/urls.c:228 ../text.py:281 ../text.py:766 ../todo.py:328 -#: ../todo.py:658 ../todo.py:689 +#: ../loader/urls.c:228 ../text.py:281 ../text.py:765 ../todo.py:325 +#: ../todo.py:639 ../todo.py:670 msgid "Error" msgstr "" @@ -44,7 +44,7 @@ msgstr "" msgid "Error unmounting %s: %s" msgstr "" -#: ../fstab.py:349 ../todo.py:411 +#: ../fstab.py:349 ../todo.py:408 msgid "Creating" msgstr "" @@ -84,15 +84,15 @@ msgstr "" #: ../text.py:65 ../text.py:100 ../text.py:101 ../text.py:120 ../text.py:143 #: ../text.py:173 ../text.py:176 ../text.py:230 ../text.py:284 ../text.py:298 #: ../text.py:300 ../text.py:319 ../text.py:321 ../text.py:343 ../text.py:345 -#: ../text.py:452 ../text.py:503 ../text.py:505 ../text.py:518 ../text.py:536 -#: ../text.py:549 ../text.py:586 ../text.py:588 ../text.py:614 ../text.py:617 -#: ../text.py:626 ../text.py:686 ../text.py:687 ../textw/constants.py:10 +#: ../text.py:452 ../text.py:502 ../text.py:504 ../text.py:517 ../text.py:535 +#: ../text.py:548 ../text.py:585 ../text.py:587 ../text.py:613 ../text.py:616 +#: ../text.py:625 ../text.py:685 ../text.py:686 ../textw/constants.py:10 #: ../textw/lilo.py:31 ../textw/lilo.py:87 ../textw/lilo.py:94 #: ../textw/lilo.py:178 ../textw/packages.py:20 ../textw/packages.py:85 #: ../textw/packages.py:144 ../textw/packages.py:153 #: ../textw/partitioning.py:23 ../textw/partitioning.py:64 #: ../textw/partitioning.py:231 ../textw/partitioning.py:280 -#: ../textw/silo.py:26 ../textw/silo.py:88 ../textw/silo.py:195 +#: ../textw/silo.py:26 ../textw/silo.py:98 ../textw/silo.py:205 #: ../textw/timezone.py:66 ../textw/userauth.py:30 ../textw/userauth.py:154 #: ../textw/userauth.py:185 ../textw/userauth.py:257 msgid "Back" @@ -114,8 +114,8 @@ msgstr "" msgid "Online Help" msgstr "" -#: ../gui.py:285 ../iw/language.py:10 ../text.py:59 ../text.py:1006 -#: ../text.py:1035 +#: ../gui.py:285 ../iw/language.py:10 ../text.py:59 ../text.py:1005 +#: ../text.py:1034 msgid "Language Selection" msgstr "" @@ -168,9 +168,9 @@ msgstr "" #: ../libfdisk/newtfsedit.c:1447 ../libfdisk/newtfsedit.c:1541 #: ../loader/urls.c:70 ../loader/urls.c:79 ../loader/urls.c:86 #: ../loader/urls.c:234 ../text.py:54 ../text.py:56 ../text.py:100 -#: ../text.py:626 ../textw/constants.py:10 ../textw/lilo.py:105 -#: ../textw/lilo.py:177 ../textw/silo.py:125 ../textw/silo.py:138 -#: ../textw/silo.py:194 +#: ../text.py:625 ../textw/constants.py:10 ../textw/lilo.py:105 +#: ../textw/lilo.py:177 ../textw/silo.py:135 ../textw/silo.py:148 +#: ../textw/silo.py:204 msgid "Ok" msgstr "" @@ -194,8 +194,8 @@ msgstr "" msgid "/dev/ttyS3 (COM4 under DOS)" msgstr "" -#: ../iw/lilo.py:221 ../iw/silo.py:246 ../text.py:98 ../textw/lilo.py:100 -#: ../textw/lilo.py:168 ../textw/silo.py:120 ../textw/silo.py:185 +#: ../iw/lilo.py:221 ../iw/silo.py:254 ../text.py:98 ../textw/lilo.py:100 +#: ../textw/lilo.py:168 ../textw/silo.py:130 ../textw/silo.py:195 msgid "Device" msgstr "" @@ -217,13 +217,13 @@ msgstr "" #: ../loader/urls.c:146 ../loader/urls.c:223 ../loader/urls.c:228 #: ../loader/urls.c:361 ../text.py:120 ../text.py:173 ../text.py:230 #: ../text.py:298 ../text.py:343 ../text.py:360 ../text.py:452 ../text.py:472 -#: ../text.py:503 ../text.py:586 ../text.py:614 ../text.py:686 ../text.py:711 -#: ../text.py:725 ../text.py:745 ../text.py:758 ../text.py:770 ../text.py:965 -#: ../text.py:969 ../text.py:1166 ../textw/lilo.py:30 ../textw/lilo.py:87 +#: ../text.py:502 ../text.py:585 ../text.py:613 ../text.py:685 ../text.py:710 +#: ../text.py:724 ../text.py:744 ../text.py:757 ../text.py:769 ../text.py:964 +#: ../text.py:968 ../text.py:1165 ../textw/lilo.py:30 ../textw/lilo.py:87 #: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:144 #: ../textw/partitioning.py:231 ../textw/partitioning.py:280 #: ../textw/partitioning.py:290 ../textw/partitioning.py:298 -#: ../textw/silo.py:25 ../textw/silo.py:88 ../textw/timezone.py:66 +#: ../textw/silo.py:25 ../textw/silo.py:98 ../textw/timezone.py:66 #: ../textw/userauth.py:30 ../textw/userauth.py:44 ../textw/userauth.py:49 #: ../textw/userauth.py:82 ../textw/userauth.py:95 ../textw/userauth.py:101 #: ../textw/userauth.py:107 ../textw/userauth.py:115 ../textw/userauth.py:124 @@ -243,7 +243,7 @@ msgstr "" msgid "Mouse Selection" msgstr "" -#: ../text.py:171 ../text.py:1008 ../text.py:1037 +#: ../text.py:171 ../text.py:1007 ../text.py:1036 msgid "Keyboard Selection" msgstr "" @@ -271,7 +271,7 @@ msgstr "" msgid "Upgrade Existing Installation" msgstr "" -#: ../text.py:228 ../text.py:1040 +#: ../text.py:228 ../text.py:1039 msgid "Installation Type" msgstr "" @@ -308,8 +308,8 @@ msgstr "" #: ../libfdisk/gnomefsedit.c:2493 ../libfdisk/newtfsedit.c:499 #: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479 #: ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582 -#: ../loader/loader.c:608 ../loader/net.c:719 ../text.py:319 ../text.py:518 -#: ../text.py:536 ../text.py:543 ../textw/partitioning.py:192 +#: ../loader/loader.c:608 ../loader/net.c:719 ../text.py:319 ../text.py:517 +#: ../text.py:535 ../text.py:542 ../textw/partitioning.py:192 msgid "Yes" msgstr "" @@ -319,8 +319,8 @@ msgstr "" #: ../libfdisk/gnomefsedit.c:2493 ../libfdisk/newtfsedit.c:499 #: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479 #: ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582 -#: ../loader/net.c:719 ../text.py:319 ../text.py:324 ../text.py:518 -#: ../text.py:536 ../text.py:546 ../textw/partitioning.py:192 +#: ../loader/net.c:719 ../text.py:319 ../text.py:324 ../text.py:517 +#: ../text.py:535 ../text.py:545 ../textw/partitioning.py:192 msgid "No" msgstr "" @@ -354,7 +354,7 @@ msgstr "" #: ../libfdisk/gnomefsedit.c:2278 ../libfdisk/newtfsedit.c:463 #: ../libfdisk/newtfsedit.c:1497 ../loader/devices.c:171 #: ../loader/loader.c:1801 ../text.py:360 ../text.py:362 ../textw/lilo.py:106 -#: ../textw/silo.py:125 ../textw/silo.py:143 ../textw/userauth.py:63 +#: ../textw/silo.py:135 ../textw/silo.py:153 ../textw/userauth.py:63 msgid "Cancel" msgstr "" @@ -390,21 +390,21 @@ msgstr "" msgid "You must enter valid IP information to continue" msgstr "" -#: ../text.py:499 +#: ../text.py:498 msgid "Hostname Configuration" msgstr "" -#: ../text.py:500 +#: ../text.py:499 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:459 ../loader/net.c:638 ../text.py:503 +#: ../iw/network.py:207 ../loader/net.c:459 ../loader/net.c:638 ../text.py:502 msgid "Hostname" msgstr "" -#: ../text.py:519 +#: ../text.py:518 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 " @@ -416,56 +416,56 @@ msgid "" "Would you like to create a boot disk for your system?" msgstr "" -#: ../text.py:538 +#: ../text.py:537 msgid "" "\n" "On SMCC made Ultra machines floppy booting probably does not work\n" "\n" msgstr "" -#: ../text.py:541 ../text.py:754 +#: ../text.py:540 ../text.py:753 msgid "Bootdisk" msgstr "" -#: ../text.py:584 +#: ../text.py:583 msgid "X probe results" msgstr "" -#: ../text.py:603 ../text.py:622 +#: ../text.py:602 ../text.py:621 msgid "Unlisted Card" msgstr "" -#: ../text.py:611 +#: ../text.py:610 msgid "Video Card Selection" msgstr "" -#: ../text.py:612 +#: ../text.py:611 msgid "Which video card do you have?" msgstr "" -#: ../text.py:624 +#: ../text.py:623 msgid "X Server Selection" msgstr "" -#: ../text.py:624 +#: ../text.py:623 msgid "Choose a server" msgstr "" -#: ../text.py:682 +#: ../text.py:681 msgid "Installation to begin" msgstr "" -#: ../iw/confirm.py:33 ../text.py:683 +#: ../iw/confirm.py:33 ../text.py:682 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:700 ../text.py:715 ../text.py:735 +#: ../text.py:699 ../text.py:714 ../text.py:734 msgid "Complete" msgstr "" -#: ../iw/congrats.py:32 ../text.py:701 +#: ../iw/congrats.py:32 ../text.py:700 msgid "" "Congratulations, installation is complete.\n" "\n" @@ -478,7 +478,7 @@ msgid "" "in the Red Hat Linux manuals." msgstr "" -#: ../text.py:716 ../text.py:736 +#: ../text.py:715 ../text.py:735 msgid "" "Congratulations, configuration is complete.\n" "\n" @@ -489,288 +489,288 @@ msgid "" "install chapter of the Official Red Hat Linux User's Guide." msgstr "" -#: ../iw/bootdisk.py:57 ../text.py:755 +#: ../iw/bootdisk.py:57 ../text.py:754 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:758 ../text.py:759 ../text.py:770 ../text.py:771 +#: ../text.py:757 ../text.py:758 ../text.py:769 ../text.py:770 #: ../textw/lilo.py:30 ../textw/silo.py:25 msgid "Skip" msgstr "" -#: ../iw/bootdisk.py:61 ../text.py:767 +#: ../iw/bootdisk.py:61 ../text.py:766 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:829 +#: ../text.py:828 msgid "Package Installation" msgstr "" -#: ../text.py:831 +#: ../text.py:830 msgid "Name : " msgstr "" -#: ../text.py:832 +#: ../text.py:831 msgid "Size : " msgstr "" -#: ../text.py:833 +#: ../text.py:832 msgid "Summary: " msgstr "" -#: ../text.py:859 +#: ../text.py:858 msgid " Packages" msgstr "" -#: ../text.py:860 +#: ../text.py:859 msgid " Bytes" msgstr "" -#: ../text.py:861 +#: ../text.py:860 msgid " Time" msgstr "" -#: ../text.py:863 +#: ../text.py:862 msgid "Total :" msgstr "" -#: ../text.py:870 +#: ../text.py:869 msgid "Completed: " msgstr "" -#: ../text.py:880 +#: ../text.py:879 msgid "Remaining: " msgstr "" -#: ../text.py:969 ../text.py:970 +#: ../text.py:968 ../text.py:969 msgid "Debug" msgstr "" -#: ../text.py:982 +#: ../text.py:981 msgid "Red Hat Linux (C) 2000 Red Hat, Inc." msgstr "" -#: ../text.py:984 +#: ../text.py:983 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../iw/welcome.py:11 ../iw/welcome.py:38 ../text.py:1004 ../text.py:1039 +#: ../iw/welcome.py:11 ../iw/welcome.py:38 ../text.py:1003 ../text.py:1038 msgid "Welcome" msgstr "" -#: ../text.py:1010 ../text.py:1078 +#: ../text.py:1009 ../text.py:1077 msgid "Hostname Setup" msgstr "" -#: ../text.py:1012 ../text.py:1080 +#: ../text.py:1011 ../text.py:1079 msgid "Network Setup" msgstr "" -#: ../text.py:1018 ../text.py:1086 +#: ../text.py:1017 ../text.py:1085 msgid "Time Zone Setup" msgstr "" -#: ../text.py:1020 ../text.py:1088 ../textw/userauth.py:9 +#: ../text.py:1019 ../text.py:1087 ../textw/userauth.py:9 msgid "Root Password" msgstr "" -#: ../text.py:1022 ../text.py:1090 ../textw/userauth.py:161 +#: ../text.py:1021 ../text.py:1089 ../textw/userauth.py:161 msgid "User Account Setup" msgstr "" -#: ../text.py:1024 ../text.py:1092 +#: ../text.py:1023 ../text.py:1091 msgid "Authentication" msgstr "" -#: ../text.py:1030 +#: ../text.py:1029 msgid "Configuration Complete" msgstr "" -#: ../text.py:1048 ../textw/silo.py:28 ../textw/silo.py:90 -#: ../textw/silo.py:202 +#: ../text.py:1047 ../textw/silo.py:28 ../textw/silo.py:100 +#: ../textw/silo.py:212 msgid "SILO Configuration" msgstr "" -#: ../text.py:1054 ../textw/lilo.py:33 ../textw/lilo.py:84 +#: ../text.py:1053 ../textw/lilo.py:33 ../textw/lilo.py:84 #: ../textw/lilo.py:186 msgid "LILO Configuration" msgstr "" -#: ../iw/lilo.py:122 ../iw/lilo.py:245 ../iw/silo.py:125 ../iw/silo.py:269 -#: ../text.py:1058 ../text.py:1064 +#: ../iw/lilo.py:122 ../iw/lilo.py:245 ../iw/silo.py:125 ../iw/silo.py:277 +#: ../text.py:1057 ../text.py:1063 msgid "Partition" msgstr "" -#: ../text.py:1060 +#: ../text.py:1059 msgid "Manually Partition" msgstr "" -#: ../text.py:1062 +#: ../text.py:1061 msgid "Automatic Partition" msgstr "" -#: ../text.py:1066 ../textw/partitioning.py:272 +#: ../text.py:1065 ../textw/partitioning.py:272 msgid "Root Filesystem Size" msgstr "" -#: ../text.py:1068 +#: ../text.py:1067 msgid "Swap" msgstr "" -#: ../text.py:1070 +#: ../text.py:1069 msgid "Filesystem Formatting" msgstr "" -#: ../iw/mouse.py:55 ../text.py:1082 ../text.py:1084 +#: ../iw/mouse.py:55 ../text.py:1081 ../text.py:1083 msgid "Mouse Configuration" msgstr "" -#: ../text.py:1094 +#: ../text.py:1093 msgid "Package Groups" msgstr "" -#: ../text.py:1096 ../text.py:1124 +#: ../text.py:1095 ../text.py:1123 msgid "Individual Packages" msgstr "" -#: ../text.py:1098 ../textw/packages.py:122 +#: ../text.py:1097 ../textw/packages.py:122 msgid "Package Dependencies" msgstr "" -#: ../iw/xconfig.py:250 ../text.py:1100 ../text.py:1108 +#: ../iw/xconfig.py:250 ../text.py:1099 ../text.py:1107 msgid "X Configuration" msgstr "" -#: ../text.py:1102 +#: ../text.py:1101 msgid "Installation Begins" msgstr "" -#: ../text.py:1104 +#: ../text.py:1103 msgid "Install System" msgstr "" -#: ../text.py:1105 ../text.py:1107 ../text.py:1126 ../text.py:1128 +#: ../text.py:1104 ../text.py:1106 ../text.py:1125 ../text.py:1127 msgid "Boot Disk" msgstr "" -#: ../text.py:1110 +#: ../text.py:1109 msgid "Installation Complete" msgstr "" -#: ../text.py:1115 +#: ../text.py:1114 msgid "Examine System" msgstr "" -#: ../text.py:1122 +#: ../text.py:1121 msgid "Customize Upgrade" msgstr "" -#: ../text.py:1125 +#: ../text.py:1124 msgid "Upgrade System" msgstr "" -#: ../text.py:1129 +#: ../text.py:1128 msgid "Upgrade Complete" msgstr "" -#: ../text.py:1163 +#: ../text.py:1162 msgid "Cancelled" msgstr "" -#: ../text.py:1164 +#: ../text.py:1163 msgid "I can't go to the previous step from here. You will have to try again." msgstr "" -#: ../todo.py:329 +#: ../todo.py:326 #, c-format msgid "Error copying file: %s" msgstr "" -#: ../todo.py:411 +#: ../todo.py:408 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:431 +#: ../todo.py:428 msgid "Reading" msgstr "" -#: ../todo.py:432 +#: ../todo.py:429 msgid "Reading package information..." msgstr "" -#: ../todo.py:628 ../todo.py:641 +#: ../todo.py:609 ../todo.py:622 msgid "no suggestion" msgstr "" -#: ../todo.py:647 +#: ../todo.py:628 msgid "Searching" msgstr "" -#: ../todo.py:648 +#: ../todo.py:629 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:659 ../todo.py:690 +#: ../todo.py:640 ../todo.py:671 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:701 +#: ../todo.py:682 msgid "Finding" msgstr "" -#: ../todo.py:702 +#: ../todo.py:683 msgid "Finding packages to upgrade..." msgstr "" -#: ../todo.py:958 +#: ../todo.py:939 msgid "Processing" msgstr "" -#: ../todo.py:959 +#: ../todo.py:940 msgid "Preparing to install..." msgstr "" -#: ../todo.py:1132 +#: ../todo.py:1119 #, c-format msgid "Upgrading %s.\n" msgstr "" -#: ../todo.py:1134 +#: ../todo.py:1121 #, c-format msgid "Installing %s.\n" msgstr "" -#: ../todo.py:1155 +#: ../todo.py:1142 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:1158 +#: ../todo.py:1145 msgid "Mount Point" msgstr "" -#: ../todo.py:1158 +#: ../todo.py:1145 msgid "Space Needed" msgstr "" -#: ../todo.py:1171 +#: ../todo.py:1158 msgid "Disk Space" msgstr "" -#: ../todo.py:1195 +#: ../todo.py:1182 msgid "Post Install" msgstr "" -#: ../todo.py:1196 +#: ../todo.py:1183 msgid "Performing post install configuration..." msgstr "" @@ -853,7 +853,7 @@ msgstr "" #: ../iw/account.py:252 ../libfdisk/newtfsedit.c:1291 #: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:177 ../textw/lilo.py:199 -#: ../textw/partitioning.py:63 ../textw/silo.py:194 ../textw/silo.py:216 +#: ../textw/partitioning.py:63 ../textw/silo.py:204 ../textw/silo.py:226 #: ../textw/userauth.py:185 msgid "Edit" msgstr "" @@ -1045,7 +1045,7 @@ msgstr "" msgid "Lilo Configuration" msgstr "" -#: ../iw/lilo.py:125 ../iw/lilo.py:246 ../iw/silo.py:130 ../iw/silo.py:270 +#: ../iw/lilo.py:125 ../iw/lilo.py:246 ../iw/silo.py:130 ../iw/silo.py:278 msgid "Type" msgstr "" @@ -1053,11 +1053,11 @@ msgstr "" msgid "Install LILO boot record on:" msgstr "" -#: ../iw/lilo.py:171 ../iw/silo.py:167 ../textw/silo.py:62 +#: ../iw/lilo.py:171 ../iw/silo.py:170 ../textw/silo.py:63 msgid "Master Boot Record (MBR)" msgstr "" -#: ../iw/lilo.py:175 ../iw/silo.py:170 ../textw/silo.py:63 +#: ../iw/lilo.py:175 ../iw/silo.py:173 ../textw/silo.py:64 msgid "First sector of boot partition" msgstr "" @@ -1065,11 +1065,11 @@ msgstr "" msgid "Use linear mode (needed for some SCSI drives)" msgstr "" -#: ../iw/lilo.py:189 ../iw/silo.py:197 +#: ../iw/lilo.py:189 ../iw/silo.py:205 msgid "Kernel parameters" msgstr "" -#: ../iw/lilo.py:206 ../iw/silo.py:215 +#: ../iw/lilo.py:206 ../iw/silo.py:223 msgid "Create boot disk" msgstr "" @@ -1077,63 +1077,63 @@ msgstr "" msgid "Do not install LILO" msgstr "" -#: ../iw/lilo.py:221 ../iw/silo.py:246 ../textw/lilo.py:168 -#: ../textw/silo.py:185 +#: ../iw/lilo.py:221 ../iw/silo.py:254 ../textw/lilo.py:168 +#: ../textw/silo.py:195 msgid "Default" msgstr "" -#: ../iw/lilo.py:221 ../iw/silo.py:246 ../textw/lilo.py:168 -#: ../textw/silo.py:185 +#: ../iw/lilo.py:221 ../iw/silo.py:254 ../textw/lilo.py:168 +#: ../textw/silo.py:195 msgid "Partition type" msgstr "" -#: ../iw/lilo.py:221 ../iw/lilo.py:257 ../iw/silo.py:246 ../iw/silo.py:281 -#: ../textw/lilo.py:101 ../textw/lilo.py:168 ../textw/silo.py:121 -#: ../textw/silo.py:185 +#: ../iw/lilo.py:221 ../iw/lilo.py:257 ../iw/silo.py:254 ../iw/silo.py:289 +#: ../textw/lilo.py:101 ../textw/lilo.py:168 ../textw/silo.py:131 +#: ../textw/silo.py:195 msgid "Boot label" msgstr "" -#: ../iw/mouse.py:132 +#: ../iw/mouse.py:141 msgid "Emulate 3 Buttons" msgstr "" -#: ../iw/network.py:148 +#: ../iw/network.py:146 msgid "Configure using DHCP" msgstr "" -#: ../iw/network.py:154 +#: ../iw/network.py:152 msgid "Activate on boot" msgstr "" -#: ../iw/network.py:163 +#: ../iw/network.py:161 msgid "IP Address" msgstr "" -#: ../iw/network.py:164 ../loader/net.c:636 +#: ../iw/network.py:162 ../loader/net.c:636 msgid "Netmask" msgstr "" -#: ../iw/network.py:165 ../loader/loader.c:240 +#: ../iw/network.py:163 ../loader/loader.c:240 msgid "Network" msgstr "" -#: ../iw/network.py:166 +#: ../iw/network.py:164 msgid "Broadcast" msgstr "" -#: ../iw/network.py:211 +#: ../iw/network.py:208 msgid "Gateway" msgstr "" -#: ../iw/network.py:211 +#: ../iw/network.py:208 msgid "Primary DNS" msgstr "" -#: ../iw/network.py:211 +#: ../iw/network.py:208 msgid "Secondary DNS" msgstr "" -#: ../iw/network.py:211 +#: ../iw/network.py:208 msgid "Ternary DNS" msgstr "" @@ -1267,19 +1267,19 @@ msgstr "" msgid "Silo Configuration" msgstr "" -#: ../iw/silo.py:162 +#: ../iw/silo.py:161 msgid "Install SILO boot record on:" msgstr "" -#: ../iw/silo.py:175 +#: ../iw/silo.py:178 msgid "Create PROM alias" msgstr "" -#: ../iw/silo.py:193 +#: ../iw/silo.py:201 msgid "Set default PROM boot device to linux" msgstr "" -#: ../iw/silo.py:225 +#: ../iw/silo.py:233 msgid "Do not install SILO" msgstr "" @@ -1385,19 +1385,19 @@ msgid "" "blank." msgstr "" -#: ../textw/lilo.py:85 ../textw/silo.py:92 +#: ../textw/lilo.py:85 ../textw/silo.py:102 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../textw/lilo.py:105 ../textw/silo.py:125 ../textw/silo.py:146 +#: ../textw/lilo.py:105 ../textw/silo.py:135 ../textw/silo.py:156 msgid "Clear" msgstr "" -#: ../textw/lilo.py:114 ../textw/silo.py:133 +#: ../textw/lilo.py:114 ../textw/silo.py:143 msgid "Edit Boot Label" msgstr "" -#: ../textw/lilo.py:181 ../textw/silo.py:197 +#: ../textw/lilo.py:181 ../textw/silo.py:207 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 " @@ -1479,11 +1479,11 @@ msgid "" "which is %d megabytes." msgstr "" -#: ../textw/silo.py:64 +#: ../textw/silo.py:65 msgid "Create PROM alias `linux'" msgstr "" -#: ../textw/silo.py:65 +#: ../textw/silo.py:66 msgid "Set default PROM boot device" msgstr "" @@ -477,7 +477,6 @@ class NetworkWindow: ("network", network), ("broadcast", broadcast)) todo.network.gateway = self.gw.value () todo.network.primaryNS = self.ns.value () - todo.network.guessHostnames () screen.popWindow() break @@ -58,7 +58,6 @@ class NetworkDevice (SimpleConfigFile): def __init__ (self, dev): self.info = { "DEVICE" : dev, "ONBOOT" : "yes" } - self.hostname = "" class Network: def __init__ (self): @@ -69,6 +68,7 @@ class Network: self.ternaryNS = "" self.domains = [] self.readData = 0 + self.isConfigured = 0 self.hostname = "localhost.localdomain" try: f = open ("/tmp/netinfo", "r") @@ -84,6 +84,7 @@ class Network: self.netdevices [info["DEVICE"]] = NetworkDevice (info["DEVICE"]) if info.has_key ("IPADDR"): self.netdevices [info["DEVICE"]].set (("IPADDR", info["IPADDR"])) + self.isConfigured = 1 if info.has_key ("NETMASK"): self.netdevices [info["DEVICE"]].set (("NETMASK", info["NETMASK"])) if info.has_key ("BOOTPROTO"): @@ -112,7 +113,10 @@ class Network: self.secondaryNS = resolv[1] elif self.ternaryNS == "": self.ternaryNS = resolv[1] - + + def getDevice(self, device): + return self.netdevices[device] + def available (self): f = open ("/proc/net/dev") lines = f.readlines() @@ -125,28 +129,21 @@ class Network: self.netdevices[dev] = NetworkDevice (dev) return self.netdevices - def guessHostnames (self): - # guess the hostname for the first device with an IP - # XXX fixme - need to set up resolv.conf - self.domains = [] - for dev in self.netdevices.values (): - ip = dev.get ("ipaddr") - if ip: - try: - (hostname, aliases, ipaddrs) = socket.gethostbyaddr (ip) - except socket.error: - hostname = "" - if hostname: - dev.hostname = hostname - if '.' in hostname: - # chop off everything before the leading '.' - self.domains.append (hostname[(string.find (hostname, '.') + 1):]) - #if self.hostname == "localhost.localdomain": - self.hostname = hostname - else: - dev.hostname = "localhost.localdomain" - if not self.domains: - self.domains = [ "localdomain" ] + def lookupHostname (self): + # can't look things up if they don't exist! + if not self.primaryNS: return + + f = open("/etc/resolv.conf", "w") + f.write("nameserver %s\n" % self.primaryNS) + f.close() + isys.resetResolv() + + try: + ip = socket.gethostbyname(self.hostname) + except socket.error: + return None + + return ip def nameservers (self): return [ self.primaryNS, self.secondaryNS, self.ternaryNS ] @@ -484,70 +481,54 @@ class ToDo: # /etc/sysconfig/network - for dev in self.network.netdevices.values (): - if dev.hostname: - hostname = dev.hostname - break - f = open (self.instPath + "/etc/sysconfig/network", "w") f.write ("NETWORKING=yes\n" "FORWARD_IPV4=false\n" - "HOSTNAME=" + self.network.hostname + "\n" - "GATEWAY=" + self.network.gateway + "\n") + "HOSTNAME=" + self.network.hostname + "\n") + if self.network.gateway: + f.write("GATEWAY=" + self.network.gateway + "\n") f.close () # /etc/hosts f = open (self.instPath + "/etc/hosts", "w") localline = "127.0.0.1\t\t" - self.log ("self.network.hostname = %s", self.network.hostname) - # if user assigned a hostname other than localhost.localdomain then - # search devices and see if this hostname has a static IP - # assignment. If not put it in loopback line to make X happy - # - if self.network.hostname != "localhost.localdomain": - foundhostname = 0 - self.log ("Looking for dev to match system hostname") - for dev in self.network.netdevices.values (): - ip = dev.get ("ipaddr") - hostname = dev.hostname - self.log ("Checking device %s: ip = %s hostname = %s", - dev.get ("device"), ip, hostname) - if hostname and ip and hostname == self.network.hostname: - foundhostname = 1 - self.log ("Device %s matched", dev.get ("device")) - break - - self.log ("foundhostname is %d", foundhostname) - - if not foundhostname: - localline = localline + self.network.hostname + " " + ip = self.network.lookupHostname() + + # If the hostname is not resolvable, tie it to 127.0.0.1 + if not ip: + localline = localline + self.network.hostname + " " + l = string.split(self.network.hostname, ".") + if len(l) > 1: + localline = localline + l[0] + " " localline = localline + "localhost.localdomain localhost\n" f.write (localline) - for dev in self.network.netdevices.values (): - ip = dev.get ("ipaddr") - if dev.hostname and ip and dev.hostname != "localhost.localdomain": - f.write ("%s\t\t%s\n" % (ip, dev.hostname)) - f.close () + + if ip: + f.write ("%s\t\t%s\n" % (ip, self.network.hostname)) # If the hostname was not looked up, but typed in by the user, # domain might not be computed, so do it now. if self.network.domains == [ "localdomain" ] or not self.network.domains: - if self.network.hostname != "localhost.localdomain": - if '.' in self.network.hostname: - # chop off everything before the leading '.' - domain = self.network.hostname[(string.find(self.network.hostname, '.') + 1):] - self.network.domains = [ domain ] + if '.' in self.network.hostname: + # chop off everything before the leading '.' + domain = self.network.hostname[(string.find(self.network.hostname, '.') + 1):] + self.network.domains = [ domain ] # /etc/resolv.conf f = open (self.instPath + "/etc/resolv.conf", "w") - f.write ("search " + string.joinfields (self.network.domains, ' ') + "\n") + + if self.network.domains != [ 'localdomain' ]: + f.write ("search " + string.joinfields (self.network.domains, ' ') + + "\n") + for ns in self.network.nameservers (): if ns: f.write ("nameserver " + ns + "\n") + f.close () def writeRootPassword (self): |