[blivet:master 09/21] Simplify NoDevFS.type.

David Lehman dlehman at redhat.com
Tue Jan 20 18:32:39 UTC 2015


On 01/15/2015 12:39 PM, mulhern wrote:
> Signed-off-by: mulhern <amulhern at redhat.com>
> ---
>   blivet/formats/fs.py | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
> index 6fede96..158b7c4 100644
> --- a/blivet/formats/fs.py
> +++ b/blivet/formats/fs.py
> @@ -1494,10 +1494,7 @@ class NoDevFS(FS):
>
>       @property
>       def type(self):
> -        if self.device != self._type:
> -            return self.device
> -        else:
> -            return self._type
> +        return self.device
>
>       @property
>       def mountType(self):
>

Please make sure this does not cause issues with special naming of nodev 
devices in blivet.devicetree.getActiveMounts. You can test this by 
setting flags.include_nodev early in examples/list_devices.py.

David


More information about the anaconda-patches mailing list