Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

initramfs: dracut - Change to some make-variables 

Change /etc/ to sysconfdir-variable and add default-config
to dracut initrd-image

Signed-off-by: theQuestionmark <17354322+theQuestionmark@users.noreply.github.com>
This commit is contained in:
theQuestionmark 2022-06-12 01:35:47 +02:00
parent 18dff34a38
commit 9f2fd4682d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
View File

@ -93,8 +93,8 @@ check() {
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [ -n "$hostonly" ]; then if [ -n "$hostonly" ]; then
if [ -f /etc/default/zfs ]; then if [ -f @sysconfdir@/default/zfs ]; then
. /etc/default/zfs . @sysconfdir@/default/zfs
if [ -n "$ZFS_INITRD_ADDITIONAL_DATASETS" ]; then if [ -n "$ZFS_INITRD_ADDITIONAL_DATASETS" ]; then
for add_zpool in $ZFS_INITRD_ADDITIONAL_DATASETS; do for add_zpool in $ZFS_INITRD_ADDITIONAL_DATASETS; do
add_mps+=$(find_add_zpool_mps "$add_zpool") add_mps+=$(find_add_zpool_mps "$add_zpool")

3
contrib/dracut/90zfs/module-setup.sh.in
View File

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