style: make indent and let shfmt fail again
The bump of removed the `-d` option for `shfmt`. Readd it until upstream is fixed. See also: https://github.com/luizm/action-sh-checker/issues/44master
parent
0620677238
commit
373eadaa9c
|
@ -32,7 +32,7 @@ jobs:
|
||||||
uses: luizm/action-sh-checker@v0.2.0
|
uses: luizm/action-sh-checker@v0.2.0
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
SHFMT_OPTS: -s # arguments to shfmt.
|
SHFMT_OPTS: -d -s # arguments to shfmt.
|
||||||
with:
|
with:
|
||||||
sh_checker_shellcheck_disable: false
|
sh_checker_shellcheck_disable: false
|
||||||
sh_checker_comment: true
|
sh_checker_comment: true
|
||||||
|
|
|
@ -1770,7 +1770,6 @@ fi
|
||||||
|
|
||||||
[[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d
|
[[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d
|
||||||
|
|
||||||
|
|
||||||
export initdir dracutbasedir \
|
export initdir dracutbasedir \
|
||||||
dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
|
dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
|
||||||
mods_to_load \
|
mods_to_load \
|
||||||
|
|
|
@ -46,8 +46,8 @@ install() {
|
||||||
inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service
|
inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service
|
||||||
|
|
||||||
# Adding default link
|
# Adding default link
|
||||||
inst_multiple -o "${systemdutildir}/network/99-default.link"
|
inst_multiple -o "${systemdutildir}/network/99-default.link"
|
||||||
[[ $hostonly ]] && inst_multiple -H -o "${systemdsystemconfdir}/network/*.link"
|
[[ $hostonly ]] && inst_multiple -H -o "${systemdsystemconfdir}/network/*.link"
|
||||||
|
|
||||||
$SYSTEMCTL -q --root "$initdir" enable nm-initrd.service
|
$SYSTEMCTL -q --root "$initdir" enable nm-initrd.service
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -147,17 +147,17 @@ enable_evm() {
|
||||||
# initialize EVM
|
# initialize EVM
|
||||||
info "Enabling EVM"
|
info "Enabling EVM"
|
||||||
if [ "$((evm_configured & EVM_INIT_X509))" -ne 0 ]; then
|
if [ "$((evm_configured & EVM_INIT_X509))" -ne 0 ]; then
|
||||||
# Older kernels did not support EVM_ALLOW_METADATA_WRITES, try for
|
# Older kernels did not support EVM_ALLOW_METADATA_WRITES, try for
|
||||||
# newer ones first that need it when an x509 is used
|
# newer ones first that need it when an x509 is used
|
||||||
echo $((evm_configured | EVM_ALLOW_METADATA_WRITES | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}" ||
|
echo $((evm_configured | EVM_ALLOW_METADATA_WRITES | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}" \
|
||||||
echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
|
|| echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
|
||||||
else
|
else
|
||||||
echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
|
echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$((evm_configured & EVM_INIT_HMAC))" -ne 0 ]; then
|
if [ "$((evm_configured & EVM_INIT_HMAC))" -ne 0 ]; then
|
||||||
# unload the EVM encrypted key
|
# unload the EVM encrypted key
|
||||||
unload_evm_key || return 1
|
unload_evm_key || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in New Issue