Attachment 161357 Details for Bug 70477 – anaconda patch

[patch] anaconda patch

70477a.diff (text/plain), 3.11 KB, created by Joel Andres Granados on 2007-08-15 13:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Andres Granados

Created: 2007-08-15 13:48:27 UTC

Size: 3.11 KB

patch

obsolete

>diff -ur anaconda-11.3.0.19/fsset.py anaconda-11.3.0.19-JG/fsset.py
>--- anaconda-11.3.0.19/fsset.py	2007-08-13 16:06:28.000000000 +0200
>+++ anaconda-11.3.0.19-JG/fsset.py	2007-08-15 14:13:06.000000000 +0200
>@@ -1123,8 +1123,10 @@
>     def fstab (self):
> 	format = "%-23s %-23s %-7s %-15s %d %d\n"
>         fstab = ""
>+        #import pdb
>+        #pdb.set_trace()
>         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 +1403,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
>diff -ur anaconda-11.3.0.19/installclass.py anaconda-11.3.0.19-JG/installclass.py
>--- anaconda-11.3.0.19/installclass.py	2007-07-16 17:55:32.000000000 +0200
>+++ anaconda-11.3.0.19-JG/installclass.py	2007-08-15 12:22:00.000000000 +0200
>@@ -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:
>diff -ur anaconda-11.3.0.19/kickstart.py anaconda-11.3.0.19-JG/kickstart.py
>--- anaconda-11.3.0.19/kickstart.py	2007-07-31 21:29:34.000000000 +0200
>+++ anaconda-11.3.0.19-JG/kickstart.py	2007-08-15 12:22:01.000000000 +0200
>@@ -178,6 +178,11 @@
>         commands.firstboot.FC3_Firstboot.parse(self, args)
>         self.handler.id.firstboot = self.firstboot
> 
>+class IgnoreSwapDev(commands.ignoreswapdev.F8_IgnoreSwapDev):
>+    def parse(self, args):
>+        commands.ignoreswapdev.F8_IgnoreSwapDev.parse(self, args)
>+        self.handler.id.instClass.setIgnoredSwapDev(self.handler.id, self.devs)
>+
> class IgnoreDisk(commands.ignoredisk.F8_IgnoreDisk):
>     def parse(self, args):
>         commands.ignoredisk.F8_IgnoreDisk.parse(self, args)
>@@ -676,6 +681,7 @@
>         "halt": Reboot,
>         "harddrive": commands.method.FC6_Method,
>         "ignoredisk": IgnoreDisk,
>+        "ignoreswapdev": IgnoreSwapDev,
>         "install": Upgrade,
>         "interactive": commands.interactive.FC3_Interactive,
>         "iscsi": Iscsi,
>diff -ur anaconda-11.3.0.19/partedUtils.py anaconda-11.3.0.19-JG/partedUtils.py
>--- anaconda-11.3.0.19/partedUtils.py	2007-07-26 16:15:43.000000000 +0200
>+++ anaconda-11.3.0.19-JG/partedUtils.py	2007-08-15 09:28:37.000000000 +0200
>@@ -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