napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bootloader] Cleanup zfs support from testing

Browse Source
This commit is contained in:
dalto 2021-11-16 17:48:49 -06:00
parent 9603cbef14
commit 7e17106f34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/bootloader/main.py
View File

@ -99,7 +99,7 @@ def get_zfs_root():
:return: A string containing the path to the zfs root or None if it is not found :return: A string containing the path to the zfs root or None if it is not found
""" """
zfs = libcalamares.globalstorage.value("zfs") zfs = libcalamares.globalstorage.value("zfsDatasets")
if not zfs: if not zfs:
libcalamares.utils.warning("Failed to locate zfs dataset list") libcalamares.utils.warning("Failed to locate zfs dataset list")
@ -109,7 +109,7 @@ def get_zfs_root():
for dataset in zfs: for dataset in zfs:
try: try:
if dataset["mountpoint"] == "/": if dataset["mountpoint"] == "/":
return dataset["zpool"] + "/" + dataset["dsname"] return dataset["zpool"] + "/" + dataset["dsName"]
except KeyError: except KeyError:
# This should be impossible # This should be impossible
libcalamares.utils.warning("Internal error handling zfs dataset") libcalamares.utils.warning("Internal error handling zfs dataset")
@ -187,7 +187,7 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
if is_zfs_root(partition): if is_zfs_root(partition):
zfs_root_path = get_zfs_root() zfs_root_path = get_zfs_root()
if zfs_root_path is not None: if zfs_root_path is not None:
kernel_params.append("root=ZFS=" + zfs_root_path) kernel_params.append("zfs=" + zfs_root_path)
else: else:
# Something is really broken if we get to this point # Something is really broken if we get to this point
libcalamares.utils.warning("Internal error handling zfs dataset") libcalamares.utils.warning("Internal error handling zfs dataset")