From 103dbbd27b3691d3aa6a1a1a271b13a55d3372d6 Mon Sep 17 00:00:00 2001 From: Alice Brooks Date: Thu, 30 May 2024 11:13:10 +0100 Subject: [PATCH] lib: Add Suse support to kernelopt.sh --- pkg/lib/kernelopt.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/lib/kernelopt.sh b/pkg/lib/kernelopt.sh index 8370fbc986f1..e0900c70fb28 100755 --- a/pkg/lib/kernelopt.sh +++ b/pkg/lib/kernelopt.sh @@ -15,8 +15,8 @@ error() { grub() { key="${2%=*}" # split off optional =value - # For the non-BLS case, or if someone overrides those with grub2-mkconfig - # or update-grub, change it in /etc/default/grub + # For the non-BLS case, or if someone overrides those with grub2-mkconfig, + # update-grub or update-bootloader, change it in /etc/default/grub if [ -e /etc/default/grub ]; then if [ "$1" = set ]; then # replace existing argument, otherwise append it @@ -38,6 +38,11 @@ grub() { elif [ -e /etc/default/grub ] && type update-grub >/dev/null 2>&1; then update-grub + # on Suse platforms, use update-bootloader + # Since earlier we updated /etc/default/grub we can just run update-bootloader + elif type update-bootloader >/dev/null 2>&1; then + update-bootloader + # on OSTree, the kernel config is inside the image elif cur=$(rpm-ostree kargs 2>&1); then if [ "$1" = set ]; then @@ -51,7 +56,7 @@ grub() { rpm-ostree kargs --delete="$key" fi else - error "No supported grub update mechanism found (grubby, update-grub, or rpm-ostree)" + error "No supported grub update mechanism found (grubby, update-grub, update-bootloader or rpm-ostree)" fi }