Attachment 157877 Details for Bug 244994 – anaconda-device-options.patch

[patch] anaconda-device-options.patch

anaconda-device-options.patch (text/plain), 2.34 KB, created by Mark McLoughlin on 2007-06-26 10:59:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2007-06-26 10:59:06 UTC

Size: 2.34 KB

patch

obsolete

>--- anaconda-11.1.2.44/fsset.py.device-options	2007-06-26 05:01:31.701451000 -0400
>+++ anaconda-11.1.2.44/fsset.py	2007-06-26 05:30:56.128860000 -0400
>@@ -1250,7 +1250,7 @@
>                 fstab = fstab + entry.device.getComment()
>                 fstab = fstab + format % (device, entry.mountpoint,
>                                           entry.fsystem.getName(),
>-                                          entry.options, entry.fsck,
>+                                          entry.getOptions(), entry.fsck,
>                                           entry.order)
>         return fstab
> 
>@@ -1264,8 +1264,9 @@
>                 # swap doesn't end up in the mtab
>                 if entry.fsystem.getName() == "swap":
>                     continue
>-                if entry.options:
>-                    options = "rw," + entry.options
>+                options = entry.getOptions()
>+                if options:
>+                    options = "rw," + options
>                 else:
>                     options = "rw"
>                 mtab = mtab + format % (devify(entry.device.getDevice()),
>@@ -1987,11 +1988,7 @@
>         self.fsystem = fsystem
>         self.origfsystem = origfsystem
>         self.migrate = migrate
>-        if options:
>-            self.options = options
>-        else:
>-            self.options = fsystem.getDefaultOptions(mountpoint)
>-        self.options += device.getDeviceOptions()
>+        self.options = options
>         self.mountcount = 0
>         self.label = None
>         if fsck == -1:
>@@ -2055,6 +2052,12 @@
> 
>     def getMountPoint(self):
> 	return self.mountpoint
>+
>+    def getOptions(self):
>+        options = self.options
>+        if not options:
>+            options = self.fsystem.getDefaultOptions(self.mountpoint)
>+        return options + self.device.getDeviceOptions()
>         
>     def setFormat (self, state):
>         if self.migrate and state:
>@@ -2094,7 +2097,7 @@
>                "  bytesPerInode: %(bytesPerInode)s label: %(label)s\n"%
>                {"device": self.device.getDevice(), "mountpoint": mntpt,
>                 "fsystem": self.fsystem.getName(), "format": self.format,
>-                "mounted": self.mountcount, "options": self.options,
>+                "mounted": self.mountcount, "options": self.getOptions(),
>                 "bytesPerInode": self.bytesPerInode, "label": self.label})
>         return str
>

Actions: View | Diff

Attachments on bug 244994: 157877