Attachment 310678 Details for Bug 318351 – anaconda part of the patch

[patch] anaconda part of the patch

0001-Add-the-only-use-option-to-specify-which-disks-sho.patch (text/plain), 2.89 KB, created by Radek Vykydal on 2008-07-01 14:48:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2008-07-01 14:48:29 UTC

Size: 2.89 KB

patch

obsolete

>From 47ac23ce17c28c6a21b64835fdbc0695ae1fe177 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Tue, 1 Jul 2008 16:18:26 +0200
>Subject: [PATCH] Add the --only-use option to specify which disks should be used.
> This is the opposite operation from ignoredisk --drives (#318351,
> backport of #198526 from fedora).
>
>---
> installclass.py |    6 ++++++
> kickstart.py    |    5 ++++-
> partedUtils.py  |    3 ++-
> upgrade.py      |    1 +
> 4 files changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/installclass.py b/installclass.py
>index 1c132c5..7e20061 100644
>--- a/installclass.py
>+++ b/installclass.py
>@@ -113,6 +113,12 @@ class BaseInstallClass:
>             if not drive in diskset.skippedDisks:
>                 diskset.skippedDisks.append(drive)
>         
>+    def setExclusiveDisks(self, id, drives):
>+        diskset = id.diskset
>+        for drive in drives:
>+            if not drive in diskset.exclusiveDisks:
>+                diskset.exclusiveDisks.append(drive)
>+
>     def setClearParts(self, id, clear, drives = None, initAll = False):
> 	id.partitions.autoClearPartType = clear
>         id.partitions.autoClearPartDrives = drives
>diff --git a/kickstart.py b/kickstart.py
>index 3c18853..fd6e1c5 100644
>--- a/kickstart.py
>+++ b/kickstart.py
>@@ -174,7 +174,10 @@ class AnacondaKSHandlers(KickstartHandlers):
> 
>     def doIgnoreDisk(self, args):
> 	KickstartHandlers.doIgnoreDisk(self, args)
>-        self.id.instClass.setIgnoredDisks(self.id, self.ksdata.ignoredisk)
>+        self.id.instClass.setIgnoredDisks(self.id, 
>+                                          self.ksdata.ignoredisk["drives"])
>+        self.id.instClass.setExclusiveDisks(self.id,
>+                                            self.ksdata.ignoredisk["onlyuse"])
> 
>     def doIscsi(self, args):
>         KickstartHandlers.doIscsi(self, args)
>diff --git a/partedUtils.py b/partedUtils.py
>index 25a8f0d..630243b 100644
>--- a/partedUtils.py
>+++ b/partedUtils.py
>@@ -583,6 +583,7 @@ class DiskSet:
>     """The disks in the system."""
> 
>     skippedDisks = []
>+    exclusiveDisks = []
>     mdList = []
>     dmList = None
>     mpList = None
>@@ -1100,7 +1101,7 @@ class DiskSet:
> 
>         for drive in self.driveList():
>             # ignoredisk takes precedence over clearpart (#186438).
>-            if drive in DiskSet.skippedDisks:
>+            if (DiskSet.exclusiveDisks != [] and drive not in DiskSet.exclusiveDisks) or drive in DiskSet.skippedDisks:
>                 continue
>             deviceFile = isys.makeDevInode(drive, "/dev/" + drive)
>             if not isys.mediaPresent(drive):
>diff --git a/upgrade.py b/upgrade.py
>index dc95ff8..a0dc57e 100644
>--- a/upgrade.py
>+++ b/upgrade.py
>@@ -146,6 +146,7 @@ def findExistingRoots(anaconda, upgradeany = 0):
> 
>     # this is a hack... need to clear the skipped disk list after this
>     partedUtils.DiskSet.skippedDisks = []
>+    partedUtils.DiskSet.exclusiveDisks = []
> 
>     return rootparts
> 
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 318351: 310678 | 310679