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

Merge pull request #1871 from dalto8/zfsfix-initcpiocfg

Browse Source 
[initcpiocfg] Only add zfs hook if zfs is enabled
This commit is contained in:
Adriaan de Groot 2022-01-12 11:31:53 +01:00 committed by GitHub
commit b227419f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/initcpiocfg/main.py
View File

@ -173,7 +173,8 @@ def find_initcpio_features(partitions, root_mount_point):
if partition["fs"] == "btrfs": if partition["fs"] == "btrfs":
uses_btrfs = True uses_btrfs = True
if partition["fs"] == "zfs": # In addition to checking the filesystem, check to ensure that zfs is enabled
if partition["fs"] == "zfs" and libcalamares.globalstorage.contains("zfsPoolInfo"):
uses_zfs = True uses_zfs = True
if "lvm2" in partition["fs"]: if "lvm2" in partition["fs"]: