summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-09-13 20:28:12 +0000
committerMatt Wilson <msw@redhat.com>1999-09-13 20:28:12 +0000
commita85ebca41d70e0a510d1bd3388adc8223a8fd1c3 (patch)
tree02cbe8b11ba987b2ee8db68a9b3664777c871c4c
parent1bff4aa8f9de6dacb4672411d09b8dc87f651e9b (diff)
downloadanaconda-a85ebca41d70e0a510d1bd3388adc8223a8fd1c3.tar.gz
anaconda-a85ebca41d70e0a510d1bd3388adc8223a8fd1c3.tar.xz
anaconda-a85ebca41d70e0a510d1bd3388adc8223a8fd1c3.zip
fix for lilo stuff
-rw-r--r--textw/lilo.py6
-rw-r--r--todo.py5
2 files changed, 5 insertions, 6 deletions
diff --git a/textw/lilo.py b/textw/lilo.py
index e8afcd4a4..fbfd72ee6 100644
--- a/textw/lilo.py
+++ b/textw/lilo.py
@@ -137,14 +137,8 @@ class LiloImagesWindow:
default = ""
- foundDos = 0
for n in sortedKeys:
(label, type) = images[n]
- if (type == 1):
- if (foundDos): continue
- foundDos = 1
- label = "dos"
- images[n] = (label, type)
listbox.append(self.formatDevice(type, label, n, default), n)
buttons = ButtonBar(screen, [ (_("Ok"), "ok"), (_("Edit"), "edit"),
diff --git a/todo.py b/todo.py
index 9ccea0435..49c335b84 100644
--- a/todo.py
+++ b/todo.py
@@ -423,6 +423,7 @@ class ToDo:
oldImages[dev] = self.liloImages[dev]
self.liloImages = {}
+ foundDos = 0
for (dev, devName, type) in drives:
# ext2 partitions get listed if
# 1) they're /
@@ -436,6 +437,10 @@ class ToDo:
self.liloImages[dev] = ("", type)
else:
self.liloImages[dev] = oldImages[dev]
+ if type == 1:
+ if foundDos: continue
+ foundDos = 1
+ self.liloImages[dev] = ("dos", type)
return self.liloImages