diff mbox series

scripts/prune-kernel: Use kernel-install if available

Message ID 20220504212714.152837-1-arbab@linux.ibm.com (mailing list archive)
State New
Headers show
Series scripts/prune-kernel: Use kernel-install if available | expand

Commit Message

Reza Arbab May 4, 2022, 9:27 p.m. UTC
If the new-kernel-pkg utility isn't present, try using kernel-install.
This is what the %preun scriptlet in scripts/package/mkspec does too.

Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
---
Hope I've sent this to the right people. get_maintainer.pl came up
blank, but kbuild seems like the nearest match in MAINTAINERS.

 scripts/prune-kernel | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Masahiro Yamada May 7, 2022, 6:23 p.m. UTC | #1
On Thu, May 5, 2022 at 6:27 AM Reza Arbab <arbab@linux.ibm.com> wrote:
>
> If the new-kernel-pkg utility isn't present, try using kernel-install.
> This is what the %preun scriptlet in scripts/package/mkspec does too.
>
> Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
> ---
> Hope I've sent this to the right people. get_maintainer.pl came up
> blank, but kbuild seems like the nearest match in MAINTAINERS.
>

Applied to linux-kbuild. Thanks.


>  scripts/prune-kernel | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/prune-kernel b/scripts/prune-kernel
> index e8aa940bc0a9..dadfd0e47f89 100755
> --- a/scripts/prune-kernel
> +++ b/scripts/prune-kernel
> @@ -16,6 +16,10 @@ do
>                  rm -f "/boot/initramfs-$f.img" "/boot/System.map-$f"
>                  rm -f "/boot/vmlinuz-$f"   "/boot/config-$f"
>                  rm -rf "/lib/modules/$f"
> -                new-kernel-pkg --remove $f
> +                if [ -x "$(command -v new-kernel-pkg)" ]; then
> +                        new-kernel-pkg --remove $f
> +                elif [ -x "$(command -v kernel-install)" ]; then
> +                        kernel-install remove $f
> +                fi
>          fi
>  done
> --
> 2.27.0
>
diff mbox series

Patch

diff --git a/scripts/prune-kernel b/scripts/prune-kernel
index e8aa940bc0a9..dadfd0e47f89 100755
--- a/scripts/prune-kernel
+++ b/scripts/prune-kernel
@@ -16,6 +16,10 @@  do
                 rm -f "/boot/initramfs-$f.img" "/boot/System.map-$f"
                 rm -f "/boot/vmlinuz-$f"   "/boot/config-$f"
                 rm -rf "/lib/modules/$f"
-                new-kernel-pkg --remove $f
+                if [ -x "$(command -v new-kernel-pkg)" ]; then
+                        new-kernel-pkg --remove $f
+                elif [ -x "$(command -v kernel-install)" ]; then
+                        kernel-install remove $f
+                fi
         fi
 done