Merge ~ubuntustudio-dev/debian-cd/+git/ubuntu:main into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

Proposed by Erich Eickmeyer
Status: Merged
Merged at revision: 9b610a0109e645c27176ad2cfe9c9aaaa0f545a4
Proposed branch: ~ubuntustudio-dev/debian-cd/+git/ubuntu:main
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 14 lines (+2/-1)
1 file modified
tools/boot/noble/common.sh (+2/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+457567@code.launchpad.net

Commit message

Handle Studio being a layered image as well now

Description of the change

Ubuntu Studio is now a layered image as part of the transition to ubuntustudio-system-installer (fork of ubuntu-flavor-installer, a layer on ubuntu-desktop-installer).

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This is probably the pragmatic thing to do but I have been meaning to modify all images using layers to set the live layer in the initrd (as server images do) rather than the kernel command line. But I certainly haven't gotten around to it in the last like year ...

Revision history for this message
Erich Eickmeyer (eeickmeyer) wrote :

> This is probably the pragmatic thing to do but I have been meaning to modify
> all images using layers to set the live layer in the initrd (as server images
> do) rather than the kernel command line. But I certainly haven't gotten around
> to it in the last like year ...

To be fair, Studio has only been layered for the past week, so you haven't missed much. :) It's suspected that the lack of a live user in LP: #2046386 may be related to this, but it's not 100% confirmed. I'll be doing a separate MP for Edubuntu sometime tomorrow as the livecd-rootfs for its layering should be landing sometime in the next 24 hours.

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/boot/noble/common.sh b/tools/boot/noble/common.sh
2index fd1d4ae..7688f02 100644
3--- a/tools/boot/noble/common.sh
4+++ b/tools/boot/noble/common.sh
5@@ -30,7 +30,8 @@ default_kernel_params() {
6 KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/xubuntu.seed maybe-ubiquity quiet splash --- "
7 ;;
8 ubuntustudio)
9- KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntustudio.seed maybe-ubiquity quiet splash --- "
10+ # Ubuntu Studio now also goes with a layered image, as above
11+ KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }layerfs-path=standard.live.squashfs --- quiet splash"
12 ;;
13 ubuntu-mate)
14 KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu-mate.seed maybe-ubiquity quiet splash --- "

Subscribers

People subscribed via source and target branches