summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-03-23 20:18:50 +0000
committerChris Lumens <clumens@redhat.com>2006-03-23 20:18:50 +0000
commitdc5432f6261c3ee4e1fefa48679ac0279f928188 (patch)
tree1f01f6ef9cb344828291841b1dcb8ad8f8d3d550
parentf7b0830555d52ed74f4518d521ed67554aa03095 (diff)
downloadanaconda-dc5432f6261c3ee4e1fefa48679ac0279f928188.tar.gz
anaconda-dc5432f6261c3ee4e1fefa48679ac0279f928188.tar.xz
anaconda-dc5432f6261c3ee4e1fefa48679ac0279f928188.zip
Ignore disks listed in ignoredisks, even if we have clearpart --all (#186438).
-rw-r--r--ChangeLog3
-rw-r--r--partedUtils.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 002d43e38..807326ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
* kickstart.py (Kickstart.setSteps): Warn if %packages is given on
upgrade.
+ * partedUtils.py (DiskSet.openDevices): Ignore disks listed in
+ ignoredisks, even if we have clearpart --all (#186438).
+
2006-03-22 David Cantrell <dcantrell@redhat.com>
* fsset.py (reiserfsFileSystem): Added missing labelDevice method.
diff --git a/partedUtils.py b/partedUtils.py
index a8be5ea88..332b284e7 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -893,7 +893,8 @@ class DiskSet:
for drive in self.driveList():
log.debug(" %s" % (drive,))
for drive in self.driveList():
- if drive in DiskSet.skippedDisks and not initAll:
+ # ignoredisk takes precedence over clearpart (#186438).
+ if drive in DiskSet.skippedDisks:
continue
deviceFile = isys.makeDevInode(drive, "/dev/" + drive)
if isys.driveIsRemovable(drive) and not flags.expert: