|
|
|
@ -5,6 +5,7 @@
|
|
|
|
|
#
|
|
|
|
|
# Copyright 2014, Aurélien Gâteau <agateau@kde.org>
|
|
|
|
|
# Copyright 2016, Teo Mrnjavac <teo@kde.org>
|
|
|
|
|
# Copyright 2017, Alf Gaida <agaida@siduction.org>
|
|
|
|
|
#
|
|
|
|
|
# Calamares is free software: you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
@ -181,8 +182,10 @@ class FstabGenerator(object):
|
|
|
|
|
print(FSTAB_HEADER, file=fstab_file)
|
|
|
|
|
|
|
|
|
|
for partition in self.partitions:
|
|
|
|
|
# Special treatment for a btrfs root with @ and @home subvolumes
|
|
|
|
|
if partition["fs"] == "btrfs" and partition["mountPoint"] == "/":
|
|
|
|
|
# Special treatment for a btrfs root with @ and @home
|
|
|
|
|
# subvolumes
|
|
|
|
|
if (partition["fs"] == "btrfs"
|
|
|
|
|
and partition["mountPoint"] == "/"):
|
|
|
|
|
output = subprocess.check_output(['btrfs',
|
|
|
|
|
'subvolume',
|
|
|
|
|
'list',
|
|
|
|
@ -249,11 +252,13 @@ class FstabGenerator(object):
|
|
|
|
|
self.root_is_ssd = is_ssd
|
|
|
|
|
|
|
|
|
|
if filesystem == "btrfs" and "subvol" in partition:
|
|
|
|
|
return dict(device="UUID=" + partition["uuid"],
|
|
|
|
|
return dict(
|
|
|
|
|
device="UUID=" + partition["uuid"],
|
|
|
|
|
mount_point=mount_point,
|
|
|
|
|
fs=filesystem,
|
|
|
|
|
options=",".join(["subvol={}".format(partition["subvol"]),
|
|
|
|
|
options]),
|
|
|
|
|
options=",".join(
|
|
|
|
|
["subvol={}".format(partition["subvol"]), options]
|
|
|
|
|
),
|
|
|
|
|
check=check,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|