initramfs: dracut - Change to some make-variables

Change /etc/ to sysconfdir-variable and add default-config to dracut initrd-image Signed-off-by: theQuestionmark <[email protected]>
openzfs · Jul 17, 2022 · 9f2fd46 · 9f2fd46
1 parent 18dff34
commit 9f2fd46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
@@ -93,8 +93,8 @@ check() {
 # shellcheck disable=SC2154
 if [ -n "$hostonly" ]; then
 
-    if [ -f /etc/default/zfs ]; then
-        . /etc/default/zfs
+    if [ -f @sysconfdir@/default/zfs ]; then
+        . @sysconfdir@/default/zfs
         if [ -n "$ZFS_INITRD_ADDITIONAL_DATASETS" ]; then
            for add_zpool in $ZFS_INITRD_ADDITIONAL_DATASETS; do
                add_mps+=$(find_add_zpool_mps "$add_zpool")

diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
@@ -64,7 +64,8 @@ install() {
 	# -o ensures there is no error upon absence of these files
 	inst_multiple -o -H \
 		"@sysconfdir@/zfs/zpool.cache" \
-		"@sysconfdir@/zfs/vdev_id.conf"
+		"@sysconfdir@/zfs/vdev_id.conf" \
+		"@sysconfdir@/default/zfs"
 
 	# Synchronize initramfs and system hostid
 	if ! inst_simple -H @sysconfdir@/hostid; then