From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 18 Jan 2022 14:20:37 +0000 (+0100)
Subject: Merge pull request #21805 from наб
X-Git-Tag: v251-rc1~507
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8513c34bece0b0cd69cb8669e4751f0cd3d28b7e;p=thirdparty%2Fsystemd.git

Merge pull request #21805 from наб

A trivial merge conflict was fixed manually.
---

8513c34bece0b0cd69cb8669e4751f0cd3d28b7e
diff --cc src/kernel-install/50-depmod.install
index fd00c436322,aa1f6b8e0ef..61afdd4e9cd
--- a/src/kernel-install/50-depmod.install
+++ b/src/kernel-install/50-depmod.install
@@@ -23,20 -23,22 +23,24 @@@ KERNEL_VERSION="$2
  
  case "$COMMAND" in
      add)
-         [[ -d "/lib/modules/${KERNEL_VERSION}/kernel" ]] || exit 0
-         [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
-             echo "Running depmod -a ${KERNEL_VERSION}"
-         exec depmod -a "${KERNEL_VERSION}"
+         [ -d "/lib/modules/$KERNEL_VERSION/kernel" ] || exit 0
+         [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+depmod -a $KERNEL_VERSION"
+         exec depmod -a "$KERNEL_VERSION"
          ;;
      remove)
 -        [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Removing /lib/modules/$KERNEL_VERSION/modules.dep and associated files"
 +        [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
 +            echo "Removing /lib/modules/${KERNEL_VERSION}/modules.dep and associated files"
-         exec rm -f /lib/modules/"${KERNEL_VERSION}"/modules.{alias{,.bin},builtin{,.alias}.bin,dep{,.bin},devname,softdep,symbols{,.bin}}
+         exec rm -f \
+             "/lib/modules/$KERNEL_VERSION/modules.alias" \
+             "/lib/modules/$KERNEL_VERSION/modules.alias.bin" \
+             "/lib/modules/$KERNEL_VERSION/modules.builtin.bin" \
++            "/lib/modules/$KERNEL_VERSION/modules.builtin.alias.bin" \
+             "/lib/modules/$KERNEL_VERSION/modules.dep" \
+             "/lib/modules/$KERNEL_VERSION/modules.dep.bin" \
+             "/lib/modules/$KERNEL_VERSION/modules.devname" \
+             "/lib/modules/$KERNEL_VERSION/modules.softdep" \
+             "/lib/modules/$KERNEL_VERSION/modules.symbols" \
+             "/lib/modules/$KERNEL_VERSION/modules.symbols.bin"
          ;;
      *)
          exit 0