summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-11-30 23:41:14 +0000
committerJeremy Katz <katzj@redhat.com>2004-11-30 23:41:14 +0000
commitd8f5b7bb863e633440e14373abd6586c479176f2 (patch)
tree7620593c6c455424c96114a2eab98a8dfd9bf77b
parent007d4f795ed4c4d723785277a1d586bc40849108 (diff)
downloadanaconda-d8f5b7bb863e633440e14373abd6586c479176f2.tar.gz
anaconda-d8f5b7bb863e633440e14373abd6586c479176f2.tar.xz
anaconda-d8f5b7bb863e633440e14373abd6586c479176f2.zip
2004-11-30 Jeremy Katz <katzj@redhat.com>
* autopart.py (setPreexistParts): Fix handling of existing partitions on drives which don't have a partition table we understand (#131333)
-rw-r--r--ChangeLog4
-rw-r--r--autopart.py3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1438ccf02..a5c0090de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-11-30 Jeremy Katz <katzj@redhat.com>
+ * autopart.py (setPreexistParts): Fix handling of existing
+ partitions on drives which don't have a partition table we
+ understand (#131333)
+
* loader2/modules.c (lateModuleSort): Fix the list to be big
enough (#140541, #140876)
diff --git a/autopart.py b/autopart.py
index c85f6faa1..a1141fae3 100644
--- a/autopart.py
+++ b/autopart.py
@@ -849,6 +849,9 @@ def setPreexistParts(diskset, requests, newParts):
for request in requests:
if request.type != REQUEST_PREEXIST:
continue
+ if not diskset.disks.has_key(request.drive):
+ log("pre-existing partition on non-native disk %s, ignoring" %(request.drive,))
+ continue
disk = diskset.disks[request.drive]
part = disk.next_partition()
while part: