mirror of
https://salsa.debian.org/kernel-team/initramfs-tools.git
synced 2026-01-26 07:37:54 +00:00
Merge branch 'shellcheck' into 'debian/latest'
silence incorrect shellcheck SC2329 See merge request kernel-team/initramfs-tools!189
This commit is contained in:
commit
af837b1650
2
debian/initramfs-tools.postinst
vendored
2
debian/initramfs-tools.postinst
vendored
@ -3,7 +3,7 @@
|
||||
set -e
|
||||
|
||||
# Regenerate initramfs whenever we go to dpkg state `installed'
|
||||
if [ "x$1" != xtriggered ]; then
|
||||
if [ "$1" != triggered ]; then
|
||||
# this activates the trigger, if triggers are working
|
||||
update-initramfs -u
|
||||
else
|
||||
|
||||
1
debian/tests/unmkinitramfs
vendored
1
debian/tests/unmkinitramfs
vendored
@ -41,6 +41,7 @@ for in_type in early main; do
|
||||
done
|
||||
|
||||
# Dummy compressor; wrapper for cat that ignores its argument (-c)
|
||||
# shellcheck disable=SC2329
|
||||
no_compressor() {
|
||||
# shellcheck disable=SC2317
|
||||
cat
|
||||
|
||||
@ -53,7 +53,7 @@ get_fsck_type_fstab () {
|
||||
# therefore never used at boot time
|
||||
if [ "${MNT_DIR}" = "/" ] || [ "${MNT_TYPE}" = "auto" ]; then
|
||||
device="$(resolve_device "${MNT_FSNAME}")"
|
||||
# shellcheck disable=SC2317
|
||||
# shellcheck disable=SC2317,SC2329
|
||||
fstype() { "/usr/lib/klibc/bin/fstype" "$@"; }
|
||||
if ! get_fstype "${device}"; then
|
||||
echo "W: Couldn't identify type of $2 file system '$MNT_FSNAME' for fsck hook" >&2
|
||||
|
||||
@ -284,7 +284,7 @@ __TMPUNCOMPRESSEDFILES=
|
||||
__TMPCPIOGZ=
|
||||
__TMPEARLYCPIO=
|
||||
__MODULES_TO_ADD=
|
||||
# shellcheck disable=SC2317
|
||||
# shellcheck disable=SC2317,SC2329
|
||||
clean_on_exit() {
|
||||
if [ "${keep}" = "y" ]; then
|
||||
echo "Working files in ${DESTDIR:-<not yet created>}," \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user