From d0db22342b922e1965e9bc346ae68a03df640ff2 Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 12 Sep 2017 05:00:37 -0400 Subject: [PATCH] [fstab] work on #797 and #796 --- src/modules/fstab/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 553eb65ef..aa4914e2f 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -6,6 +6,7 @@ # Copyright 2014, Aurélien Gâteau # Copyright 2016, Teo Mrnjavac # Copyright 2017, Alf Gaida +# Copyright 2017, Philip Müller # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -184,7 +185,7 @@ class FstabGenerator(object): for partition in self.partitions: # Special treatment for a btrfs root with @ and @home # subvolumes - if (partition["fs"] == "btrfs" + if (partition["fs"].lower() == "btrfs" and partition["mountPoint"] == "/"): output = subprocess.check_output(['btrfs', 'subvolume',