emo/tinyramfs
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

tinyramfs: fix init* hooks not getting copied

Browse Source 
copy_file overwrites global _dir variable which lead to skipping
copying init* hooks.
This commit is contained in:
illiliti 2021-05-21 22:24:08 +03:00
parent 81370bb5ac
commit 8abfcc9052
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tinyramfs
View File

@ -227,22 +227,22 @@ copy_hook()
{ {
hook="$1" hook="$1"
for _dir in "$hksdir" /etc/tinyramfs/hooks /usr/share/tinyramfs/hooks; do for hook_dir in "$hksdir" /etc/tinyramfs/hooks /usr/share/tinyramfs/hooks; do
[ -f "${_dir}/${hook}/${hook}" ] && break [ -f "${hook_dir}/${hook}/${hook}" ] && break
done || panic "could not find $hook hook" done || panic "could not find $hook hook"
print "running $hook hook" print "running $hook hook"
# https://www.shellcheck.net/wiki/SC1090 # https://www.shellcheck.net/wiki/SC1090
# shellcheck disable=1090 # shellcheck disable=1090
. "${_dir}/${hook}/${hook}" . "${hook_dir}/${hook}/${hook}"
for _type in init init.late; do for _type in init init.late; do
[ -f "${_dir}/${hook}/${hook}.${_type}" ] || continue [ -f "${hook_dir}/${hook}/${hook}.${_type}" ] || continue
print "copying ${hook}.${_type}" print "copying ${hook}.${_type}"
copy_file "${_dir}/${hook}/${hook}.${_type}" \ copy_file "${hook_dir}/${hook}/${hook}.${_type}" \
"/usr/share/tinyramfs/hooks/${hook}/${hook}.${_type}" 644 0 "/usr/share/tinyramfs/hooks/${hook}/${hook}.${_type}" 644 0
done done
} }