[blivet: f21/master] Don't append btrfs mount options to None (#1150872)
David Shea
dshea at redhat.com
Thu Oct 9 21:04:18 UTC 2014
---
blivet/devices/btrfs.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index f3e5970..e2931e3 100644
--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
@@ -473,7 +473,10 @@ class BTRFSSubVolumeDevice(BTRFSDevice, RaidDevice):
return
# propagate mount options specified for members via kickstart
- opts = "%s,subvol=%s" % (self.volume.format.mountopts, self.name)
+ opts = "subvol=%s" % self.name
+ if self.volume.format.mountopts:
+ opts = "%s,%s" % (self.volume.format.mountopts, opts)
+
self.format.mountopts = opts
@property
--
2.1.0
More information about the anaconda-patches
mailing list