cleanup
This commit is contained in:
32
tinyramfs
32
tinyramfs
@@ -72,11 +72,11 @@ prepare_environment()
|
||||
|
||||
# false positive
|
||||
# shellcheck disable=1090
|
||||
for _file in $_config /etc/tinyramfs/config; do
|
||||
for _file in "$_config" /etc/tinyramfs/config; do
|
||||
[ -f "$_file" ] && { . "$_file"; break; }
|
||||
done || panic "failed to source config"
|
||||
|
||||
for _dir in $_filesdir /usr/share/tinyramfs; do
|
||||
for _dir in "$_filesdir" /usr/share/tinyramfs; do
|
||||
[ -d "$_dir" ] && { filesdir="$_dir"; break; }
|
||||
done || panic "failed to locate required files"
|
||||
|
||||
@@ -94,6 +94,8 @@ prepare_environment()
|
||||
workdirlib="${workdir}/usr/lib/"
|
||||
modker="${moddir}/${kernel}"
|
||||
|
||||
# false positive
|
||||
# shellcheck disable=2015
|
||||
[ "$debug" = 1 ] && set -x || trap trap_helper EXIT INT
|
||||
}
|
||||
|
||||
@@ -116,8 +118,8 @@ install_requirements()
|
||||
print "installing requirements"
|
||||
|
||||
# install required binaries
|
||||
for _binary in \[ sh ln mkdir blkid \
|
||||
sleep mount printf setsid \
|
||||
for _binary in \[ sh ln kill mkdir \
|
||||
blkid sleep mount printf \
|
||||
switch_root "${filesdir}/device-helper"
|
||||
do
|
||||
install_binary "$_binary"
|
||||
@@ -178,15 +180,15 @@ install_devmgr()
|
||||
{
|
||||
print "installing device manager"
|
||||
|
||||
# false positive
|
||||
# shellcheck disable=2016
|
||||
case "$devmgr" in
|
||||
none)
|
||||
# TODO implement mode without device manager using deprecated
|
||||
# /sys/kernel/uevent_helper or /proc/sys/kernel/hotplug
|
||||
;;
|
||||
mdev)
|
||||
for _binary in kill mdev; do
|
||||
install_binary "$_binary"
|
||||
done
|
||||
install_binary mdev
|
||||
|
||||
printf "%s\n" \
|
||||
'SUBSYSTEM=block;.* 0:0 660 @device-helper' \
|
||||
@@ -194,16 +196,14 @@ install_devmgr()
|
||||
|
||||
[ "$monolith" = 1 ] && return 0
|
||||
|
||||
for _binary in find sort; do
|
||||
install_binary "$_binary"
|
||||
done
|
||||
install_binary find
|
||||
|
||||
printf "%s\n" \
|
||||
'$MODALIAS=.* 0:0 660 @modprobe "$MODALIAS"' \
|
||||
>> "${workdir}/etc/mdev.conf"
|
||||
;;
|
||||
mdevd)
|
||||
for _binary in kill mdevd mdevd-coldplug; do
|
||||
for _binary in mdevd mdevd-coldplug; do
|
||||
install_binary "$_binary"
|
||||
done
|
||||
|
||||
@@ -320,7 +320,7 @@ install_module()
|
||||
[ -e "${workdir}${module}" ] && continue
|
||||
|
||||
install -Dm644 "$module" "${workdir}${module}" || panic
|
||||
done || :
|
||||
done
|
||||
}
|
||||
|
||||
install_hostonly_modules()
|
||||
@@ -332,7 +332,7 @@ install_hostonly_modules()
|
||||
|
||||
while read -r _module || [ "$_module" ]; do
|
||||
install_module "$_module"
|
||||
done || :
|
||||
done
|
||||
|
||||
# install LVM modules
|
||||
[ "$lvm" = 1 ] &&
|
||||
@@ -354,7 +354,7 @@ install_hostonly_modules()
|
||||
if [ "$root_type" ]; then
|
||||
install_module "$root_type"
|
||||
else
|
||||
while read -r _ _dir _type _ || [ "$_dir" ]; do
|
||||
while read -r _ _dir _type _; do
|
||||
[ "$_dir" = / ] || continue
|
||||
|
||||
install_module "${root_type=$_type}"; break
|
||||
@@ -387,7 +387,7 @@ install_all_modules()
|
||||
_module="${_module%%.*}"
|
||||
|
||||
install_module "$_module"
|
||||
done || :
|
||||
done
|
||||
}
|
||||
|
||||
install_modules()
|
||||
@@ -471,7 +471,7 @@ install_binary()
|
||||
_library="${_library% *}"
|
||||
|
||||
install_library "$_library"
|
||||
done || :
|
||||
done
|
||||
}
|
||||
|
||||
install_library()
|
||||
|
||||
Reference in New Issue
Block a user