diff options
| -rw-r--r-- | fstab.py | 46 | ||||
| -rw-r--r-- | installclass.py | 44 | ||||
| -rw-r--r-- | iw/installpath.py | 4 | ||||
| -rw-r--r-- | iw/rootpartition.py | 76 | ||||
| -rw-r--r-- | po/anaconda.pot | 164 | ||||
| -rw-r--r-- | textw/partitioning.py | 3 | ||||
| -rw-r--r-- | todo.py | 9 |
7 files changed, 171 insertions, 175 deletions
@@ -25,6 +25,36 @@ def _(str): class Fstab: + def attemptPartitioning(self, partitions, clearParts): + attempt = [] + swapCount = 0 + + fstab = [] + for (mntpoint, dev, fstype, reformat, size) in self.extraFilesystems: + fstab.append ((dev, mntpoint)) + + ddruid = self.createDruid(fstab = fstab) + + for (mntpoint, size, maxsize, grow) in partitions: + type = 0x83 + if (mntpoint == "swap"): + mntpoint = "Swap%04d-auto" % swapCount + swapCount = swapCount + 1 + type = 0x82 + + attempt.append((mntpoint, size, type, grow, -1)) + + try: + ddruid.attempt (attempt, "Junk Argument", clearParts) + return ddruid + except: + pass + + return None + + def setDruid(self, druid): + self.ddruid = druid + def rescanPartitions(self): if self.ddruid: self.closeDrives() @@ -325,6 +355,16 @@ class Fstab: def getBadBlockCheck(self): return self.badBlockCheck + def createDruid(self, fstab = []): + return self.fsedit(0, self.driveList(), fstab, self.zeroMbr, + self.readOnly) + + def getRunDruid(self): + return self.shouldRunDruid + + def setRunDruid(self, state): + self.shouldRunDruid = state + def __init__(self, fsedit, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow): self.fsedit = fsedit @@ -339,8 +379,10 @@ class Fstab: self.messageWindow = messageWindow self.badBlockCheck = 0 self.extraFilesystems = [] - self.ddruid = self.fsedit(0, self.driveList(), [], - zeroMbr, readOnly) + self.ddruid = self.createDruid() + # I intentionally don't initialize this, as all install paths should + # initialize this automatically + #self.shouldRunDruid = 0 class GuiFstab(Fstab): diff --git a/installclass.py b/installclass.py index 654e2a3c7..e2acf9a9a 100644 --- a/installclass.py +++ b/installclass.py @@ -18,34 +18,6 @@ _ = cat.gettext class InstallClass: - # ummm, HACK - def finishPartitioning(self, ddruid): - if not self.partitions: return - - attempt = [] - swapCount = 0 - - for (mntpoint, size, maxsize, grow) in self.partitions: - type = 0x83 - if (mntpoint == "swap"): - mntpoint = "Swap%04d-auto" % swapCount - swapCount = swapCount + 1 - type = 0x82 - - attempt.append((mntpoint, size, type, grow, -1)) - - try: - ddruid.attempt (attempt, "Junk Argument", self.clearParts) - return 1 - except: - # life's a female dog <shrug> -- we should log something though - # <double-shrug> - self.skipPartitioning = 0 - self.clearPartText = None - pass - - return 0 - # look in mouse.py for a list of valid mouse names -- use the LONG names def setMouseType(self, name, device = None, emulateThreeButtons = 0): self.mouse = (name, device, emulateThreeButtons) @@ -81,12 +53,8 @@ class InstallClass: return self.timezone def removeFromSkipList(self, type): - if type == "partition": - self.skipPartitioning = 0 - self.removeFromSkipList("format") - else: - if self.skipSteps.has_key(type): - del self.skipSteps[type] + if self.skipSteps.has_key(type): + del self.skipSteps[type] def addToSkipList(self, type): # this throws an exception if there is a problem @@ -94,10 +62,7 @@ class InstallClass: "package-selection", "bootdisk", "partition", "format", "timezone", "accounts", "dependencies", "language", "keyboard", "xconfig", "welcome", "installtype", "mouse", "confirm-install" ].index(type) - if type == "partition": - self.skipPartitioning = 1 - else: - self.skipSteps[type] = 1 + self.skipSteps[type] = 1 def setHostname(self, hostname): self.hostname = hostname @@ -197,7 +162,6 @@ class InstallClass: self.gateway = "" self.nameserver = "" self.partitions = [] - self.skipPartitioning = 0 self.clearParts = 0 self.clearType = None self.clearText = None @@ -235,7 +199,6 @@ class Workstation(InstallClass): if not expert: self.addToSkipList("lilo") self.addToSkipList("authentication") - self.addToSkipList("partition") self.addToSkipList("package-selection") self.addToSkipList("format") @@ -272,7 +235,6 @@ class Server(InstallClass): self.addToSkipList("lilo") self.addToSkipList("package-selection") self.addToSkipList("authentication") - self.addToSkipList("partition") self.addToSkipList("format") if os.uname ()[4] != 'sparc64': diff --git a/iw/installpath.py b/iw/installpath.py index 3f9930195..bcd856322 100644 --- a/iw/installpath.py +++ b/iw/installpath.py @@ -51,8 +51,8 @@ class InstallPathWindow (InstallWindow): BootloaderSkipname = "lilo" self.installSteps = [ - ( AutoPartitionWindow, "partition" ), FDiskWindow, + ( AutoPartitionWindow, "partition" ), ( PartitionWindow, "partition" ), ( FormatWindow, "format" ), ( BootloaderWindow, BootloaderSkipname ), @@ -106,6 +106,8 @@ class InstallPathWindow (InstallWindow): if not self.__dict__.has_key("upgradeButton"): return + self.todo.fstab.setRunDruid(InstallPathWindow.fdisk.get_active()) + icw = self.ics.getICW () if self.upgradeButton.get_active(): self.todo.upgrade = 1 diff --git a/iw/rootpartition.py b/iw/rootpartition.py index cc07a4eab..b2bfff2ff 100644 --- a/iw/rootpartition.py +++ b/iw/rootpartition.py @@ -60,6 +60,7 @@ class PartitionWindow (InstallWindow): return 1 def getNext (self): + if not self.running: return 0 self.todo.fstab.runDruidFinished() # FIXME @@ -84,24 +85,11 @@ class PartitionWindow (InstallWindow): self.ics.setNextEnabled (value) def getScreen (self): - if 0 and self.todo.getSkipPartitioning(): - self.skippedScreen = 1 - fstab = self.todo.ddruid.getFstab () - self.todo.resetMounts() - for (partition, mount, fsystem, size) in fstab: - self.todo.addMount(partition, mount, fsystem) - if mount == "/": - rootPartition = partition - elif mount == "/boot": - bootPartition = partition - if not self.checkSwap (): - return AutoPartitionWindow - return None - + self.running = 0 + if not self.todo.fstab.getRunDruid(): return None + self.running = 1 return self.todo.fstab.runDruid(self.enableCallback) - return self.bin - class AutoPartitionWindow(InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) @@ -111,24 +99,36 @@ class AutoPartitionWindow(InstallWindow): ics.setNextEnabled (TRUE) self.ics = ics - def getNext(self): - from gnomepyfsedit import fsedit + def getPrev(self): + self.druid = None + self.beingDisplayed = 0 - if (self.__dict__.has_key("manuallyPartition") and - self.manuallyPartition.get_active()): - self.todo.manuallyPartition() + def getNext(self): + if not self.beingDisplayed: return + + if not self.__dict__.has_key("manuallyPartition"): + self.todo.fstab.setRunDruid(1) + elif self.manuallyPartition.get_active(): + self.todo.fstab.setRunDruid(1) + self.todo.fstab.rescanPartitions() + else: + self.todo.fstab.setRunDruid(0) + self.todo.fstab.setDruid(self.druid) + + self.beingDisplayed = 0 return None + def __init__(self, todo): + InstallWindow.__init__(self, todo) + self.druid = None + self.beingDisplayed = 0 + def getScreen (self): - from gnomepyfsedit import fsedit from installpath import InstallPathWindow - return None - if (InstallPathWindow.fdisk and InstallPathWindow.fdisk.get_active ()): - self.todo.manuallyPartition() return None # XXX hack @@ -136,21 +136,22 @@ class AutoPartitionWindow(InstallWindow): self.ics.readHTML (self.todo.instClass.clearType) todo = self.todo + self.druid = None - self.fstab = [] - for mntpoint, (dev, fstype, reformat) in todo.mounts.items (): - self.fstab.append ((dev, mntpoint)) + if self.todo.instClass.partitions: + self.druid = \ + todo.fstab.attemptPartitioning(todo.instClass.partitions, + todo.instClass.clearParts) + self.ics.setNextEnabled (TRUE) - if not todo.ddruid: - drives = todo.drives.available ().keys () - drives.sort (isys.compareDrives) - todo.ddruid = fsedit(0, drives, self.fstab, self.todo.zeroMbr, - self.todo.ddruidReadOnly) - if not todo.instClass.finishPartitioning(todo.ddruid): - self.todo.log ("Autopartitioning FAILED\n") + if not self.druid: + # auto partitioning failed + self.todo.fstab.setRunDruid(1) + return - if not todo.getPartitionWarningText(): - return None + if not todo.getPartitionWarningText(): + self.fstab.setRunDruid(0) + return label = \ GtkLabel(_("%s\n\nIf you don't want to do this, you can continue with " @@ -179,6 +180,7 @@ class AutoPartitionWindow(InstallWindow): box.pack_start(align, TRUE, TRUE) box.set_border_width (5) + self.beingDisplayed = 1 return box diff --git a/po/anaconda.pot b/po/anaconda.pot index 23ac43b9a..705d4bfc9 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-11 16:03-0500\n" +"POT-Creation-Date: 1999-12-21 18:51-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,53 +14,53 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../fstab.py:69 ../fstab.py:190 +#: ../fstab.py:124 ../fstab.py:245 msgid "Formatting" msgstr "" -#: ../fstab.py:70 +#: ../fstab.py:125 #, c-format msgid "Formatting swap space on /dev/%s..." msgstr "" -#: ../fstab.py:132 ../fstab.py:221 ../libfdisk/newtfsedit.c:1540 +#: ../fstab.py:187 ../fstab.py:276 ../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 +#: ../loader/loader.c:880 ../loader/loader.c:885 ../loader/loader.c:1621 +#: ../loader/loader.c:1667 ../loader/loader.c:1738 ../loader/urls.c:206 +#: ../loader/urls.c:211 ../text.py:234 ../text.py:694 ../todo.py:880 +#: ../todo.py:1206 msgid "Error" msgstr "" -#: ../fstab.py:133 +#: ../fstab.py:188 #, c-format msgid "Error unmounting %s: %s" msgstr "" -#: ../fstab.py:144 ../todo.py:531 +#: ../fstab.py:199 ../todo.py:523 msgid "Creating" msgstr "" -#: ../fstab.py:144 +#: ../fstab.py:199 msgid "Creating RAID devices..." msgstr "" -#: ../fstab.py:191 +#: ../fstab.py:246 #, c-format msgid "Formatting %s filesystem..." msgstr "" -#: ../fstab.py:222 +#: ../fstab.py:277 #, c-format msgid "Error mounting %s: %s" msgstr "" -#: ../gui.py:284 ../gui.py:530 +#: ../gui.py:269 ../gui.py:515 msgid "Next" msgstr "" -#: ../gui.py:285 ../gui.py:529 ../libfdisk/newtfsedit.c:1292 +#: ../gui.py:270 ../gui.py:514 ../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 @@ -75,58 +75,58 @@ msgstr "" #: ../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/partitioning.py:63 ../textw/partitioning.py:189 #: ../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:286 ../gui.py:534 +#: ../gui.py:271 ../gui.py:519 msgid "Show Help" msgstr "" -#: ../gui.py:287 ../gui.py:533 +#: ../gui.py:272 ../gui.py:518 msgid "Hide Help" msgstr "" -#: ../gui.py:288 ../gui.py:532 +#: ../gui.py:273 ../gui.py:517 msgid "Finish" msgstr "" -#: ../gui.py:291 ../gui.py:556 +#: ../gui.py:276 ../gui.py:540 msgid "Online Help" msgstr "" -#: ../gui.py:292 ../iw/language.py:10 ../text.py:52 ../text.py:934 +#: ../gui.py:277 ../iw/language.py:10 ../text.py:52 ../text.py:934 #: ../text.py:963 msgid "Language Selection" msgstr "" -#: ../gui.py:496 +#: ../gui.py:481 msgid "Red Hat Linux Installer" msgstr "" -#: ../gui.py:500 +#: ../gui.py:485 msgid "Red Hat Linux Install Shell" msgstr "" -#: ../gui.py:511 +#: ../gui.py:496 #, c-format msgid "Red Hat Linux Installer on %s" msgstr "" -#: ../gui.py:512 +#: ../gui.py:497 #, c-format msgid "Red Hat Linux Install Shell on %s" msgstr "" -#: ../installclass.py:247 +#: ../installclass.py:210 msgid "" "You are about to erase any preexisting Linux installations on your system." msgstr "" -#: ../installclass.py:286 +#: ../installclass.py:248 msgid "" "You are about to erase ALL DATA on your hard drive to make room for your " "Linux installation." @@ -143,8 +143,8 @@ msgstr "" #: ../loader/loader.c:471 ../loader/loader.c:481 ../loader/loader.c:639 #: ../loader/loader.c:697 ../loader/loader.c:742 ../loader/loader.c:880 #: ../loader/loader.c:885 ../loader/loader.c:971 ../loader/loader.c:1110 -#: ../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/loader.c:1621 ../loader/loader.c:1667 ../loader/loader.c:1730 +#: ../loader/loader.c:1738 ../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:55 ../text.py:110 #: ../text.py:163 ../text.py:208 ../text.py:251 ../text.py:296 ../text.py:387 @@ -152,7 +152,7 @@ msgstr "" #: ../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/packages.py:136 ../textw/partitioning.py:189 ../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 @@ -288,7 +288,7 @@ msgstr "" #: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 #: ../libfdisk/newtfsedit.c:1581 ../loader/loader.c:603 ../loader/net.c:703 #: ../text.py:272 ../text.py:449 ../text.py:467 ../text.py:474 -#: ../textw/partitioning.py:164 +#: ../textw/partitioning.py:154 msgid "Yes" msgstr "" @@ -299,7 +299,7 @@ msgstr "" #: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 #: ../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 +#: ../textw/partitioning.py:154 msgid "No" msgstr "" @@ -641,97 +641,97 @@ msgstr "" msgid "I can't go to the previous step from here. You will have to try again." msgstr "" -#: ../todo.py:531 +#: ../todo.py:523 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:676 +#: ../todo.py:668 msgid "Reading" msgstr "" -#: ../todo.py:677 +#: ../todo.py:669 msgid "Reading package information..." msgstr "" -#: ../todo.py:845 ../todo.py:855 +#: ../todo.py:837 ../todo.py:847 msgid "no suggestion" msgstr "" -#: ../todo.py:861 +#: ../todo.py:853 msgid "Searching" msgstr "" -#: ../todo.py:862 +#: ../todo.py:854 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:889 +#: ../todo.py:881 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:908 +#: ../todo.py:900 msgid "Finding" msgstr "" -#: ../todo.py:909 +#: ../todo.py:901 msgid "Finding packages to upgrade..." msgstr "" -#: ../todo.py:1101 +#: ../todo.py:1084 msgid "Processing" msgstr "" -#: ../todo.py:1102 +#: ../todo.py:1085 msgid "Preparing to install..." msgstr "" -#: ../todo.py:1218 +#: ../todo.py:1201 msgid "Rebuilding" msgstr "" -#: ../todo.py:1219 +#: ../todo.py:1202 msgid "Rebuilding RPM database..." msgstr "" -#: ../todo.py:1224 +#: ../todo.py:1207 msgid "Rebuild of RPM database failed. You may be out of disk space?" msgstr "" -#: ../todo.py:1274 +#: ../todo.py:1257 #, c-format msgid "Upgrading %s.\n" msgstr "" -#: ../todo.py:1276 +#: ../todo.py:1259 #, c-format msgid "Installing %s.\n" msgstr "" -#: ../todo.py:1297 +#: ../todo.py:1280 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:1300 +#: ../todo.py:1283 msgid "Mount Point" msgstr "" -#: ../todo.py:1300 +#: ../todo.py:1283 msgid "Space Needed" msgstr "" -#: ../todo.py:1314 +#: ../todo.py:1297 msgid "Disk Space" msgstr "" -#: ../todo.py:1337 +#: ../todo.py:1319 msgid "Post Install" msgstr "" -#: ../todo.py:1338 +#: ../todo.py:1320 msgid "Performing post install configuration..." msgstr "" @@ -802,7 +802,7 @@ msgstr "" #: ../iw/account.py:207 ../libfdisk/newtfsedit.c:1291 #: ../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/partitioning.py:62 ../textw/silo.py:184 ../textw/silo.py:206 #: ../textw/userauth.py:172 msgid "Edit" msgstr "" @@ -913,7 +913,7 @@ msgstr "" msgid "fdisk" msgstr "" -#: ../iw/fdisk.py:88 +#: ../iw/fdisk.py:79 msgid "Select drive to run fdisk on" msgstr "" @@ -946,15 +946,15 @@ msgstr "" msgid "Install Type" msgstr "" -#: ../iw/installpath.py:161 +#: ../iw/installpath.py:172 msgid "Install" msgstr "" -#: ../iw/installpath.py:163 +#: ../iw/installpath.py:174 msgid "Upgrade" msgstr "" -#: ../iw/installpath.py:216 +#: ../iw/installpath.py:227 msgid "Use fdisk" msgstr "" @@ -1154,22 +1154,22 @@ msgstr "" msgid "Disk Druid" msgstr "" -#: ../iw/rootpartition.py:43 ../textw/partitioning.py:159 +#: ../iw/rootpartition.py:43 ../textw/partitioning.py:149 msgid "Low Memory" msgstr "" -#: ../iw/rootpartition.py:44 ../textw/partitioning.py:160 +#: ../iw/rootpartition.py:44 ../textw/partitioning.py:150 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:117 ../textw/partitioning.py:126 +#: ../iw/rootpartition.py:94 ../textw/partitioning.py:116 msgid "Automatic Partitioning" msgstr "" -#: ../iw/rootpartition.py:167 ../textw/partitioning.py:127 +#: ../iw/rootpartition.py:153 ../textw/partitioning.py:117 #, c-format msgid "" "%s\n" @@ -1179,11 +1179,11 @@ msgid "" "installation." msgstr "" -#: ../iw/rootpartition.py:181 +#: ../iw/rootpartition.py:167 msgid "Remove data" msgstr "" -#: ../iw/rootpartition.py:184 ../textw/partitioning.py:131 +#: ../iw/rootpartition.py:170 ../textw/partitioning.py:121 msgid "Manually partition" msgstr "" @@ -1298,7 +1298,7 @@ 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:96 ../textw/lilo.py:114 +#: ../loader/loader.c:1730 ../textw/lilo.py:96 ../textw/lilo.py:114 #: ../textw/silo.py:123 ../textw/silo.py:141 ../textw/userauth.py:62 msgid "Cancel" msgstr "" @@ -1321,7 +1321,7 @@ msgid "" "installed." msgstr "" -#: ../textw/partitioning.py:14 ../textw/partitioning.py:57 +#: ../textw/partitioning.py:14 ../textw/partitioning.py:56 msgid "Disk Setup" msgstr "" @@ -1335,22 +1335,22 @@ msgid "" "Which tool would you like to use?" msgstr "" -#: ../textw/partitioning.py:58 +#: ../textw/partitioning.py:57 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:63 +#: ../loader/loader.c:303 ../loader/loader.c:328 ../textw/partitioning.py:62 msgid "Done" msgstr "" -#: ../textw/partitioning.py:131 ../textw/partitioning.py:132 +#: ../textw/partitioning.py:121 ../textw/partitioning.py:122 msgid "Continue" msgstr "" -#: ../textw/partitioning.py:179 +#: ../textw/partitioning.py:169 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 " @@ -1358,11 +1358,11 @@ msgid "" "previous install." msgstr "" -#: ../textw/partitioning.py:196 +#: ../textw/partitioning.py:186 msgid "Check for bad blocks during format" msgstr "" -#: ../textw/partitioning.py:201 +#: ../textw/partitioning.py:191 msgid "Choose Partitions to Format" msgstr "" @@ -2023,7 +2023,7 @@ msgid "Module Parameters" msgstr "" #: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:253 -#: ../loader/loader.c:312 ../loader/loader.c:328 ../loader/loader.c:1727 +#: ../loader/loader.c:312 ../loader/loader.c:328 ../loader/loader.c:1730 msgid "Devices" msgstr "" @@ -2031,7 +2031,7 @@ msgstr "" msgid "Insert your driver disk and press \"OK\" to continue." msgstr "" -#: ../loader/devices.c:179 ../loader/loader.c:1736 +#: ../loader/devices.c:179 ../loader/loader.c:1739 msgid "Failed to mount floppy disk." msgstr "" @@ -2209,35 +2209,35 @@ msgstr "" msgid "What type of media contains the packages to be installed?" msgstr "" -#: ../loader/loader.c:1619 +#: ../loader/loader.c:1622 msgid "Cannot find ks.cfg on boot floppy." msgstr "" -#: ../loader/loader.c:1665 +#: ../loader/loader.c:1668 #, c-format msgid "Failed to read directory %s: %s" msgstr "" -#: ../loader/loader.c:1728 +#: ../loader/loader.c:1731 msgid "Insert your updates disk and press \"OK\" to continue." msgstr "" #. Copy everything to /tmp/updates so .so files don't get run #. from /dev/fd0. We could (and probably should) get smarter about #. this at some point. -#: ../loader/loader.c:1741 +#: ../loader/loader.c:1744 msgid "Updates" msgstr "" -#: ../loader/loader.c:1741 +#: ../loader/loader.c:1744 msgid "Reading anaconda updates..." msgstr "" -#: ../loader/loader.c:1894 +#: ../loader/loader.c:1897 msgid "PC Card" msgstr "" -#: ../loader/loader.c:1894 +#: ../loader/loader.c:1897 msgid "Initializing PC Card Devices..." msgstr "" diff --git a/textw/partitioning.py b/textw/partitioning.py index b31c1d8c3..6b569315f 100644 --- a/textw/partitioning.py +++ b/textw/partitioning.py @@ -98,9 +98,6 @@ class ManualPartitionWindow: class AutoPartitionWindow: def __call__(self, screen, todo): - return - from newtpyfsedit import fsedit - fstab = [] for mntpoint, (dev, fstype, reformat) in todo.mounts.items (): fstab.append ((dev, mntpoint)) @@ -1008,18 +1008,9 @@ class ToDo: if todo.instClass.desktop: todo.desktop.set (todo.instClass.desktop) - def getSkipPartitioning(self): - return self.instClass.skipPartitioning - def getPartitionWarningText(self): return self.instClass.clearPartText - def manuallyPartition(self): - self.instClass.skipPartitioning = 0 - self.instClass.clearPartText = None - self.instClass.removeFromSkipList("partition") - self.instClass.removeFromSkipList("format") - # List of (accountName, fullName, password) tupes def setUserList(todo, users): todo.users = users |