Merge pull request #21805 from наб

A trivial merge conflict was fixed manually.

diff --cc src/kernel-install/50-depmod.install
index fd00c436322a3a992ab093a46e406db33fc6394a,aa1f6b8e0ef29738e73fab78e3f41c5dd7cd3280..61afdd4e9cd5f6175fd4daca38770a14bf32447a
--- 1/src/kernel-install/50-depmod.install
--- 2/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

diff --cc src/kernel-install/kernel-install
Simple merge