[blivet:master 11/17] Change TmpFS._getOptions() so it always appends _size_option.

mulhern amulhern at redhat.com
Tue Jan 6 20:38:13 UTC 2015


Previously, if the options had not been set, so that default options were
used, the size_option would not be appended to the options.
Now it is appended in either case.

If _size_option has been set to the empty string it still does not get
appended.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/formats/fs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index e705cc8..f5d7b21 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -1618,8 +1618,8 @@ class TmpFS(NoDevFS):
         # when the filesystem is resized;
         # replacing the size option in the otherwise free-form
         # options string would get messy fast)
-        opts = ",".join([o for o in [self.mountopts, self._size_option] if o])
-        return opts or "defaults"
+        opts = super(TmpFS, self)._getOptions()
+        return ",".join(o for o in (opts, self._size_option) if o)
 
     @property
     def size(self):
-- 
1.9.3



More information about the anaconda-patches mailing list