Attachment 310679 Details for Bug 318351 – pykickstart part of the patch

[patch] pykickstart part of the patch

0001-Add-support-for-the-only-use-argument-to-RHEL5.patch (text/plain), 2.59 KB, created by Radek Vykydal on 2008-07-01 14:49:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2008-07-01 14:49:25 UTC

Size: 2.59 KB

patch

obsolete

>From abb802fa93dd4262e72a3ec58308f5df3ce2c463 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Tue, 1 Jul 2008 16:37:16 +0200
>Subject: [PATCH] Add support for the --only-use argument to RHEL5.
> Changes required by #318351.
>
>Backport of commit b16d18c4240512ab39f49cddf24027f6ca00ab54 from fedora.
>---
> pykickstart/data.py   |    2 +-
> pykickstart/parser.py |    4 +++-
> pykickstart/writer.py |   13 ++++++++++---
> 3 files changed, 14 insertions(+), 5 deletions(-)
>
>diff --git a/pykickstart/data.py b/pykickstart/data.py
>index 0199719..af404f9 100644
>--- a/pykickstart/data.py
>+++ b/pykickstart/data.py
>@@ -33,7 +33,7 @@ class KickstartData:
>         self.driverdisk = ""
>         self.firewall = {"enabled": True, "ports": [], "trusts": []}
>         self.firstboot = FIRSTBOOT_SKIP
>-        self.ignoredisk = []
>+        self.ignoredisk = {"drives": [], "onlyuse": []}
>         self.interactive = False
>         self.iscsi = []
>         self.iscsiname = ""
>diff --git a/pykickstart/parser.py b/pykickstart/parser.py
>index c4a0e82..b2de56a 100644
>--- a/pykickstart/parser.py
>+++ b/pykickstart/parser.py
>@@ -418,10 +418,12 @@ class KickstartHandlers:
>         op = KSOptionParser(lineno=self.lineno)
>         op.add_option("--drives", dest="drives", action="callback",
>                       callback=drive_cb, nargs=1, type="string")
>+        op.add_option("--only-use", dest="onlyuse", action="callback",
>+                      callback=drive_cb, nargs=1, type="string")
> 
>         (opts, extra) = op.parse_args(args=args)
> 
>-        self.ksdata.ignoredisk = opts.drives
>+        self._setToDict(op, opts, self.ksdata.ignoredisk)
> 
>     def doInteractive(self, args):
>         if len(args) > 0:
>diff --git a/pykickstart/writer.py b/pykickstart/writer.py
>index 1f0f6d9..c9a6006 100644
>--- a/pykickstart/writer.py
>+++ b/pykickstart/writer.py
>@@ -206,9 +206,16 @@ class KickstartWriter:
>             return retval + "firstboot --reconfig"
> 
>     def doIgnoreDisk(self):
>-        if len(self.ksdata.ignoredisk) > 0:
>-            retval = string.join (self.ksdata.ignoredisk, ",")
>-            return "ignoredisk --drives=%s" % retval
>+        retval = ""
>+
>+        if len(self.ksdata.ignoredisk["drives"]) > 0:
>+            retval = retval + " --drives=%" % string.join(self.ksdata.ignoredisk["drives"], ",")
>+
>+        if len(self.ksdata.ignoredisk["onlyuse"]) > 0:
>+            retval = retval + " --only-use=%" % string.join(self.ksdata.ignoredisk["onlyuse"], ",")
>+
>+        if retval != "":    
>+            return "ignoredisk %s" % retval
> 
>     def doInteractive(self):
>         if self.ksdata.interactive:
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 318351: 310678 | 310679