diff options
| author | Erik Troan <ewt@redhat.com> | 2000-01-10 23:27:14 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2000-01-10 23:27:14 +0000 |
| commit | 875c2cf0e78b58c6141644a1386d04593fa8ae25 (patch) | |
| tree | c9311d5abea50e0b6325ab5f86e4a720bb4e0b49 /textw | |
| parent | 7c69982b5aca9e088ed1b34534ddd214fdea8355 (diff) | |
| download | anaconda-875c2cf0e78b58c6141644a1386d04593fa8ae25.tar.gz anaconda-875c2cf0e78b58c6141644a1386d04593fa8ae25.tar.xz anaconda-875c2cf0e78b58c6141644a1386d04593fa8ae25.zip | |
loopback installs work in tui
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/lilo.py | 6 | ||||
| -rw-r--r-- | textw/partitioning.py | 23 |
2 files changed, 19 insertions, 10 deletions
diff --git a/textw/lilo.py b/textw/lilo.py index 09c83a177..b97765eba 100644 --- a/textw/lilo.py +++ b/textw/lilo.py @@ -10,6 +10,10 @@ import string class LiloAppendWindow: def __call__(self, screen, todo): + if todo.fstab.rootOnLoop(): + todo.skipLilo = 1 + return INSTALL_NOOP + t = TextboxReflowed(53, _("A few systems will need to pass special options " "to the kernel at boot time for the system to function " @@ -40,7 +44,7 @@ class LiloAppendWindow: if button == "skip": todo.skipLilo = 1 - todo.liloDevice = None + todo.setLiloLocation(None) else: todo.skipLilo = 0 diff --git a/textw/partitioning.py b/textw/partitioning.py index 1af12a16f..b9930c17e 100644 --- a/textw/partitioning.py +++ b/textw/partitioning.py @@ -240,42 +240,47 @@ class LoopSizeWindow: return INSTALL_NOOP avail = apply(isys.spaceAvailable, todo.fstab.getRootDevice()) - size = todo.fstab.getLoopbackSize() + (size, swapSize) = todo.fstab.getLoopbackSize() if not size: size = avail / 2 + swapSize = 32 sizeEntry = Entry(6, "%d" % (size,)) + swapSizeEntry = Entry(6, "%d" % (swapSize,)) while 1: (rc, ent) = EntryWindow(screen, _("Root Filesystem Size"), _("You've chosen to put your root filesystem in a file on " - "an already-existing DOS or Windows filesystem. How large " - "would you like to make the root filesystem? You may make it " - "up to %d megabytes in size.") % (avail, ), - [ ( _("Size (in megabytes)"), sizeEntry ) ], + "an already-existing DOS or Windows filesystem. How large, " + "in megabytes, should would you like the root filesystem " + "to be, and how much swap space would you like? They must " + "total less then %d megabytes in size." % (avail, )), + [ ( _("Root filesystem size"), sizeEntry ), + ( _("Swap space"), swapSizeEntry ) ], buttons = [ (_("OK"), "ok"), (_("Back"), "back") ] ) if rc == "back": return INSTALL_BACK try: size = int(sizeEntry.value()) + swapSize = int(swapSizeEntry.value()) except: ButtonChoiceWindow(screen, _("Bad Size"), _("The size you enter must be a number."), buttons = [ _("OK") ]) continue - if size >= avail: + if size + swapSize >= avail: ButtonChoiceWindow(screen, _("Bad Size"), - _("The size must be smaller then the amount of free" - " space on the disk, which is %d megabytes." + _("The total size must be smaller then the amount of " + "free space on the disk, which is %d megabytes." % (avail, )), buttons = [ _("OK") ]) continue break - todo.fstab.setLoopbackSize(size) + todo.fstab.setLoopbackSize(size, swapSize) return INSTALL_NOOP |