shaba/dracut
1
0
Fork 0
mirror of https://github.com/dracutdevs/dracut.git synced 2024-10-26 07:55:28 +03:00
Code Issues Projects Releases Wiki Activity

chore(shfmt): update to pass with shfmt v3.5.1

Browse Source
This commit is contained in:
Laszlo Gombos 2022-11-20 23:58:31 +00:00 committed by Jóhann B. Guðmundsson
parent d777dd3dab
commit 16931f5236
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dracut-init.sh
View File

@ -1070,8 +1070,7 @@ for_each_module_dir() {
_func=$1
for _moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
[[ -d $_moddir ]] || continue
[[ -e $_moddir/install || -e $_moddir/installkernel || -e \
$_moddir/module-setup.sh ]] || continue
[[ -e $_moddir/install || -e $_moddir/installkernel || -e $_moddir/module-setup.sh ]] || continue
_mod=${_moddir##*/}
_mod=${_mod#[0-9][0-9]}
$_func "$_mod" 1 "$_moddir"

8
modules.d/00systemd/module-setup.sh
View File

@ -47,7 +47,6 @@ install() {
"$systemdutildir"/system-generators/systemd-debug-generator \
"$systemdutildir"/system-generators/systemd-fstab-generator \
"$systemdutildir"/system-generators/systemd-gpt-auto-generator \
\
"$systemdsystemunitdir"/debug-shell.service \
"$systemdsystemunitdir"/cryptsetup.target \
"$systemdsystemunitdir"/cryptsetup-pre.target \
@ -79,9 +78,7 @@ install() {
"$systemdsystemunitdir"/timers.target \
"$systemdsystemunitdir"/paths.target \
"$systemdsystemunitdir"/umount.target \
\
"$systemdsystemunitdir"/sys-kernel-config.mount \
\
"$systemdsystemunitdir"/modprobe@.service \
"$systemdsystemunitdir"/kmod-static-nodes.service \
"$systemdsystemunitdir"/systemd-tmpfiles-setup.service \
@ -109,7 +106,6 @@ install() {
"$systemdsystemunitdir"/systemd-random-seed-load.service \
"$systemdsystemunitdir"/systemd-random-seed.service \
"$systemdsystemunitdir"/systemd-sysctl.service \
\
"$systemdsystemunitdir"/sysinit.target.wants/systemd-modules-load.service \
"$systemdsystemunitdir"/sysinit.target.wants/systemd-ask-password-console.path \
"$systemdsystemunitdir"/sysinit.target.wants/systemd-journald.service \
@ -124,18 +120,14 @@ install() {
"$systemdsystemunitdir"/sysinit.target.wants/systemd-tmpfiles-setup.service \
"$systemdsystemunitdir"/sysinit.target.wants/systemd-tmpfiles-setup-dev.service \
"$systemdsystemunitdir"/sysinit.target.wants/systemd-sysctl.service \
\
"$systemdsystemunitdir"/ctrl-alt-del.target \
"$systemdsystemunitdir"/reboot.target \
"$systemdsystemunitdir"/systemd-reboot.service \
"$systemdsystemunitdir"/syslog.socket \
\
"$systemdsystemunitdir"/slices.target \
"$systemdsystemunitdir"/system.slice \
"$systemdsystemunitdir"/-.slice \
\
"$tmpfilesdir"/systemd.conf \
\
journalctl systemctl \
echo swapoff \
kmod insmod rmmod modprobe modinfo depmod lsmod \

4
modules.d/90kernel-modules-extra/module-setup.sh
View File

@ -120,8 +120,8 @@ installkernel() {
continue
fi
if [[ '*' == "$kverpat" || \
$kernel =~ $kverpat ]]; then
if [[ '*' == "$kverpat" ]] \
|| [[ $kernel =~ $kverpat ]]; then
external_dirs+=("$path")
prdebug "$cfg: added external" \

3
modules.d/90livenet/parse-livenet.sh
View File

@ -13,8 +13,7 @@ if [ -n "$updates" ]; then
echo > /tmp/net.ifaces
fi
echo "$updates" > /tmp/liveupdates.info
echo '[ -e /tmp/liveupdates.done ]' > \
"$hookdir"/initqueue/finished/liveupdates.sh
echo '[ -e /tmp/liveupdates.done ]' > "$hookdir"/initqueue/finished/liveupdates.sh
fi
str_starts "$root" "live:" && liveurl="$root"

4
modules.d/95zfcp_rules/parse-zfcp.sh
View File

@ -31,8 +31,8 @@ EOF
fi
}
if [[ -f /sys/firmware/ipl/ipl_type && \
$(< /sys/firmware/ipl/ipl_type) == "fcp" ]]; then
if [[ -f /sys/firmware/ipl/ipl_type ]] \
&& [[ $(< /sys/firmware/ipl/ipl_type) == "fcp" ]]; then
(
read -r _wwpn < /sys/firmware/ipl/wwpn
read -r _lun < /sys/firmware/ipl/lun