From 69635ea048f8d62e701babdfbb306c12107fab2d Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Thu, 31 Jul 2025 17:12:22 +0200 Subject: tools/boot/noble: Switch ubuntustudio to generic kernel Starting with Plucky (and hence hwe-6.14) the lowlatency kernel is the generic kernel with some bootargs to make it lowlatency. Going forwar, there is no lowlatency flavor anymore. This commit fixes only Noble for the upcoming .3 point release. Plucky and Questing come later... Signed-off-by: Juerg Haefliger --- tools/boot/noble/boot-amd64 | 3 --- tools/boot/noble/common.sh | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/boot/noble/boot-amd64 b/tools/boot/noble/boot-amd64 index 12c7c574..859883e8 100755 --- a/tools/boot/noble/boot-amd64 +++ b/tools/boot/noble/boot-amd64 @@ -18,9 +18,6 @@ cd $CDDIR/.. # pick default kernel FLAVOUR=generic -if [ "$PROJECT" = "ubuntustudio" ]; then - FLAVOUR=lowlatency -fi # rename kernel+initrd mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz diff --git a/tools/boot/noble/common.sh b/tools/boot/noble/common.sh index 264334d5..1546b43e 100644 --- a/tools/boot/noble/common.sh +++ b/tools/boot/noble/common.sh @@ -1,7 +1,7 @@ # encode the right CD kernel parameteres, for every project default_kernel_params() { case $PROJECT in - ubuntu|edubuntu|ubuntustudio|ubuntu-budgie|kubuntu|lubuntu|ubuntu-unity|ubuntucinnamon|xubuntu|ubuntu-mate) + ubuntu|edubuntu|ubuntu-budgie|kubuntu|lubuntu|ubuntu-unity|ubuntucinnamon|xubuntu|ubuntu-mate) KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } --- quiet splash" ;; ubuntukylin) @@ -10,6 +10,10 @@ default_kernel_params() { ubuntu-server) KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } ---" ;; + ubuntustudio) + # Nowadays lowlatency is the generic kernel plus bootargs + KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } --- quiet splash preempt=full rcu_nocbs=all" + ;; esac } -- cgit v1.2.3