Attachment 294642 Details for Bug 218929 – anacondas patch

[patch] anacondas patch

ignoredevA.diff (text/plain), 2.63 KB, created by Joel Andres Granados on 2008-02-12 09:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Andres Granados

Created: 2008-02-12 09:59:15 UTC

Size: 2.63 KB

patch

obsolete

>diff --git a/fsset.py b/fsset.py
>index 903811e..c63ffdf 100644
>--- a/fsset.py
>+++ b/fsset.py
>@@ -1286,7 +1286,7 @@ class FileSystemSet:
>         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:
>                 # use LABEL if the device has a label except for multipath
>                 # devices.  always use devname on mpath devices
>                 if entry.getLabel() and \
>@@ -1305,7 +1305,7 @@ class FileSystemSet:
>         format = "%s %s %s %s 0 0\n"
>         mtab = ""
>         for entry in self.entries:
>-            if not entry.isMounted():
>+            if not entry.isMounted() and entry.device.getDevice() not in partedUtils.DiskSet.skippedSwapDevs:
>                 continue
>             if entry.mountpoint:
>                 # swap doesn't end up in the mtab
>@@ -1617,7 +1617,7 @@ MAILADDR root
> 
>         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
>diff --git a/installclass.py b/installclass.py
>index 1c132c5..0636656 100644
>--- a/installclass.py
>+++ b/installclass.py
>@@ -456,6 +456,12 @@ class BaseInstallClass:
> 	#id.setPackageSelection()
> 	#id.setGroupSelection()
> 
>+    def setIgnoreSwapDevs(self, id, devs):
>+        diskset = id.diskset
>+        for dev in devs:
>+            if not dev in diskset.skippedSwapDevs:
>+                diskset.skippedSwapDevs.append(dev)
>+
>     def __init__(self, expert):
> 	pass
> 
>diff --git a/kickstart.py b/kickstart.py
>index 3c18853..2bc7a40 100644
>--- a/kickstart.py
>+++ b/kickstart.py
>@@ -630,6 +630,11 @@ class AnacondaKSHandlers(KickstartHandlers):
> 
>         isys.flushDriveDict()
> 
>+    def doIgnoreSwapDevs(self, args):
>+        KickstartHandlers.doIgnoreSwapDevs(self, args)
>+        self.id.instClass.setIgnoreSwapDevs(self.id, self.ksdata.ignoreswapdevs["devs"])
>+
>+
> class VNCHandlers(KickstartHandlers):
>     # We're only interested in the handler for the VNC command.
>     def __init__ (self, ksdata):
>diff --git a/partedUtils.py b/partedUtils.py
>index 51fc9bd..197448f 100644
>--- a/partedUtils.py
>+++ b/partedUtils.py
>@@ -583,6 +583,7 @@ class DiskSet:
>     """The disks in the system."""
> 
>     skippedDisks = []
>+    skippedSwapDevs = []
>     mdList = []
>     dmList = None
>     mpList = None

Actions: View | Diff

Attachments on bug 218929: 294642 | 294643 | 294670