summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorнаб <nabijaczleweli@nabijaczleweli.xyz>2022-05-14 15:12:14 +0200
committerнаб <nabijaczleweli@nabijaczleweli.xyz>2022-05-14 15:21:34 +0200
commitb32217e8d0536a9d8942d99813dcd5edb4d73fd2 (patch)
tree24f8ad94880f94ff36a2d09ca9fa7c18e3eaaccc
parentb0bf2a802f2bf4cf11bc9390f7b1b36bc829c460 (diff)
downloadsystemd-b32217e8d0536a9d8942d99813dcd5edb4d73fd2.tar.gz
Don't not lint kernel-install
-rw-r--r--.github/workflows/linter.yml4
-rw-r--r--src/kernel-install/90-loaderentry.install4
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 0956661512..ecdd7970d2 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -36,11 +36,9 @@ jobs:
# Excludes:
# - man/.* - all snippets in man pages (false positives due to
# missing shebangs)
- # - kernel-install/.* - false-positives for dropins (and I'm afraid
- # to touch kernel-install)
# - .*\.(in|SKELETON) - all template/skeleton files
# - tools/coverity\.sh - external file (with some modifications)
- FILTER_REGEX_EXCLUDE: .*/(man/.*|src/kernel-install/.*|.*\.(in|SKELETON)|tools/coverity\.sh)$
+ FILTER_REGEX_EXCLUDE: .*/(man/.*|.*\.(in|SKELETON)|tools/coverity\.sh)$
VALIDATE_ALL_CODEBASE: false
VALIDATE_BASH: true
VALIDATE_GITHUB_ACTIONS: true
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index 9faf19814a..d26766accc 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -34,7 +34,7 @@ BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
if [ "$BOOT_MNT" = '/' ]; then
ENTRY_DIR="$ENTRY_DIR_ABS"
else
- ENTRY_DIR="${ENTRY_DIR_ABS#$BOOT_MNT}"
+ ENTRY_DIR="${ENTRY_DIR_ABS#"$BOOT_MNT"}"
fi
case "$COMMAND" in
@@ -53,8 +53,10 @@ case "$COMMAND" in
esac
if [ -r /etc/os-release ]; then
+ # shellcheck source=/dev/null
. /etc/os-release
elif [ -r /usr/lib/os-release ]; then
+ # shellcheck source=/dev/null
. /usr/lib/os-release
fi