[blivet: f21/master] Don't append btrfs mount options to None (#1150872)
Brian C. Lane
bcl at redhat.com
Fri Oct 10 01:23:21 UTC 2014
On Thu, Oct 09, 2014 at 05:04:18PM -0400, David Shea wrote:
> ---
> 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
Ack
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list