summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-03-08 16:43:35 +0000
committerChris Lumens <clumens@redhat.com>2007-03-08 16:43:35 +0000
commit75bae4beeda2415bbdabcfb9c4aaeaf74bf0ada9 (patch)
tree97af4837e44add9b64a3360c507892069740ca0e
parent21687b67b7766c64e66a54ae2afea03dc43da44b (diff)
downloadanaconda-75bae4beeda2415bbdabcfb9c4aaeaf74bf0ada9.tar.gz
anaconda-75bae4beeda2415bbdabcfb9c4aaeaf74bf0ada9.tar.xz
anaconda-75bae4beeda2415bbdabcfb9c4aaeaf74bf0ada9.zip
Ignore disks listed in ignoredisks, even if we have clearpart --all
(#186438).
-rw-r--r--ChangeLog5
-rw-r--r--partedUtils.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d826fc46b..79119505d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-08 Chris Lumens <clumens@redhat.com>
+
+ * partedUtils.py (DiskSet.openDevices): Ignore disks listed in
+ ignoredisks, even if we have clearpart --all (#186438).
+
2007-03-06 Dave Lehman <dlehman@redhat.com>
* anaconda.spec: Bump version.
diff --git a/partedUtils.py b/partedUtils.py
index ac632d54e..1fadca3e2 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -827,7 +827,8 @@ class DiskSet:
if self.disks:
return
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)
if isys.driveIsRemovable(drive) and not flags.expert: