Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dracut): link hooks directory from /lib/dracut/hooks to /var/lib/dracut/hooks #186

Merged
merged 1 commit into from
Apr 17, 2024
Merged

fix(dracut): link hooks directory from /lib/dracut/hooks to /var/lib/dracut/hooks #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dracut-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ inst_hook() {
dfatal "No such hook type $1. Aborting initrd creation."
exit 1
fi
hook="/lib/dracut/hooks/${1}/${2}-${3##*/}"
hook="/var/lib/dracut/hooks/${1}/${2}-${3##*/}"
inst_simple "$3" "$hook"
chmod u+x "$initdir/$hook"
}
Expand Down
6 changes: 5 additions & 1 deletion dracut.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,11 @@ mkdir -p "${initdir}"/lib/dracut

if [[ $kernel_only != yes ]]; then
mkdir -p "${initdir}/etc/cmdline.d"
mkdir -m 0755 "${initdir}"/lib/dracut/hooks
mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks

# symlink to old hooks location for compatibility
ln_r /var/lib/dracut/hooks /lib/dracut/hooks

for _d in $hookdirs; do
# shellcheck disable=SC2174
mkdir -m 0755 -p "${initdir}/lib/dracut/hooks/$_d"
Expand Down
5 changes: 4 additions & 1 deletion modules.d/99base/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ install() {

[ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib
mkdir -m 0755 -p "${initdir}"/lib/dracut
mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks
mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks

# symlink to old hooks location for compatibility
ln_r /var/lib/dracut/hooks /lib/dracut/hooks

mkdir -p "${initdir}"/tmp

Expand Down
8 changes: 5 additions & 3 deletions modules.d/99shutdown/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ install() {
inst_multiple umount poweroff reboot halt losetup stat sleep timeout
inst_multiple -o kexec
inst "$moddir/shutdown.sh" "$prefix/shutdown"
[ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib
mkdir -m 0755 -p "${initdir}"/lib/dracut
mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks
mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks

# symlink to old hooks location for compatibility
ln_r /var/lib/dracut/hooks /lib/dracut/hooks

for _d in $hookdirs shutdown shutdown-emergency; do
mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks/"$_d"
done
Expand Down
Loading