From: наб <nabijaczleweli@nabijaczleweli.xyz>
Date: Sat, 14 May 2022 13:12:14 +0000 (+0200)
Subject: Don't not lint kernel-install
X-Git-Tag: v251~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23377%2Fhead;p=thirdparty%2Fsystemd.git

Don't not lint kernel-install
---

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 0956661512c..ecdd7970d27 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 9faf19814a7..d26766accc8 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