Attachment 169503 Details for Bug 70477 – Polished anaconda patch

[patch] Polished anaconda patch

anacondaISS.diff (text/plain), 4.24 KB, created by Joel Andres Granados on 2007-08-23 16:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Andres Granados

Created: 2007-08-23 16:39:29 UTC

Size: 4.24 KB

patch

obsolete

>Index: fsset.py
>===================================================================
>RCS file: /usr/local/CVS/anaconda/fsset.py,v
>retrieving revision 1.334
>diff -u -r1.334 fsset.py
>--- fsset.py	17 Aug 2007 14:20:44 -0000	1.334
>+++ fsset.py	23 Aug 2007 16:22:08 -0000
>@@ -1124,7 +1124,7 @@
> 	format = "%-23s %-23s %-7s %-15s %d %d\n"
>         fstab = ""
>         for entry in self.entries:
>-            if entry.mountpoint:
>+            if entry.mountpoint and entry.device.getDevice() not in partedUtils.DiskSet.skippedSwapDevs:
>                 if entry.getLabel():
>                     device = "LABEL=%s" % (entry.getLabel(),)
>                 else:
>@@ -1401,7 +1401,7 @@
> 
>         for entry in self.entries:
>             if (entry.fsystem and entry.fsystem.getName() == "swap"
>-                and not entry.isMounted()):
>+                and not entry.isMounted() and entry.device.getDevice() not in partedUtils.DiskSet.skippedSwapDevs):
>                 try:
>                     entry.mount(chroot)
>                     self.mountcount = self.mountcount + 1
>Index: installclass.py
>===================================================================
>RCS file: /usr/local/CVS/anaconda/installclass.py,v
>retrieving revision 1.295
>diff -u -r1.295 installclass.py
>--- installclass.py	16 Jul 2007 15:55:32 -0000	1.295
>+++ installclass.py	23 Aug 2007 16:22:08 -0000
>@@ -116,6 +116,12 @@
>             if not drive in diskset.skippedDisks:
>                 diskset.skippedDisks.append(drive)
> 
>+    def setIgnoredSwapDev(self, id, devs):
>+        diskset = id.diskset
>+        for dev in devs:
>+            if not dev in diskset.skippedSwapDevs:
>+                diskset.skippedSwapDevs.append(dev)
>+
>     def setExclusiveDisks(self, id, drives):
>         diskset = id.diskset
>         for drive in drives:
>Index: kickstart.py
>===================================================================
>RCS file: /usr/local/CVS/anaconda/kickstart.py,v
>retrieving revision 1.384
>diff -u -r1.384 kickstart.py
>--- kickstart.py	31 Jul 2007 19:29:34 -0000	1.384
>+++ kickstart.py	23 Aug 2007 16:22:08 -0000
>@@ -32,6 +32,7 @@
> from pykickstart.errors import *
> from pykickstart.parser import *
> from pykickstart.version import *
>+import pykickstart.base as base
> from rhpl.translate import _
> 
> import logging
>@@ -184,6 +185,35 @@
>         self.handler.id.instClass.setIgnoredDisks(self.handler.id, self.ignoredisk)
>         self.handler.id.instClass.setExclusiveDisks(self.handler.id, self.onlyuse)
> 
>+class IgnoreSwapDev(base.KickstartCommand):
>+    def __init__(self, writePriority=0, ignoreswapdev=None):
>+        base.KickstartCommand.__init__(self, writePriority)
>+
>+        if ignoreswapdev == None:
>+            self.devs = []
>+	else:
>+	    self.devs = ignoreswapdev
>+
>+    def __str__(self):
>+        if len(self.devs) > 0:
>+            return "ignoreswapdev --devs=%s\n" % string.join(self.devs, ",")
>+        else:
>+            return ""
>+
>+    def parse(self, args):
>+        def dev_cb (option, opt_str, value, parser):
>+            for d in value.split(','):
>+                parser.values.ensure_value(option.dest, []).append(d)
>+
>+        op = KSOptionParser(lineno=self.lineno)
>+        op.add_option("--devs", dest="devs", action="callback",
>+                      callback=dev_cb, nargs=1, type="string")
>+
>+        (opts, extra) = op.parse_args(args=args)
>+        self._setToSelf(op, opts)
>+
>+	self.handler.id.instClass.setIgnoredSwapDev(self.handler.id, self.devs)
>+
> class Iscsi(commands.iscsi.FC6_Iscsi):
>     def parse(self, args):
>         commands.iscsi.FC3_Iscsi.parse(self, args)
>@@ -676,6 +706,7 @@
>         "halt": Reboot,
>         "harddrive": commands.method.FC6_Method,
>         "ignoredisk": IgnoreDisk,
>+	    "ignoreswapdev": IgnoreSwapDev,
>         "install": Upgrade,
>         "interactive": commands.interactive.FC3_Interactive,
>         "iscsi": Iscsi,
>Index: partedUtils.py
>===================================================================
>RCS file: /usr/local/CVS/anaconda/partedUtils.py,v
>retrieving revision 1.136
>diff -u -r1.136 partedUtils.py
>--- partedUtils.py	26 Jul 2007 14:15:43 -0000	1.136
>+++ partedUtils.py	23 Aug 2007 16:22:08 -0000
>@@ -595,6 +595,7 @@
>     """The disks in the system."""
> 
>     skippedDisks = []
>+    skippedSwapDevs = []
>     mdList = []
>     clearedDisks = []
>     exclusiveDisks = []

Actions: View | Diff

Attachments on bug 70477: 161357 | 161359 | 161992 | 169502 | 169503