* fsset.py: Mark iSCSI root with _netdev mount option (patch from

        markmc AT redhat DOT com, #245725).

1 files changed, 12 insertions, 9 deletions

diff --git a/fsset.py b/fsset.py
index f3d021722..7fd6ec5d9 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1236,7 +1236,7 @@ class FileSystemSet:
                 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
 
@@ -1250,8 +1250,9 @@ class FileSystemSet:
                 # 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()),
@@ -1918,11 +1919,7 @@ class FileSystemSetEntry:
         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:
@@ -1986,6 +1983,12 @@ class FileSystemSetEntry:
 
     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:
@@ -2025,7 +2028,7 @@ class FileSystemSetEntry:
                "  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