From 73042a91a636854d0a5b86ab4b2c644beaa8e5cd Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 23 Feb 2026 18:18:31 -0500 Subject: [PATCH] Switch to supporting the livecd-rootfs-only ISO build system --- common/modules/before_bootloader_context.conf | 10 +++++++--- common/modules/before_bootloader_mkdirs_context.conf | 10 ---------- common/modules/mount.conf | 2 +- .../shellprocess_before_bootloader_kerncopy.conf | 5 +++++ common/modules/shellprocess_rmcdrom.conf | 6 ++++++ debian/changelog | 2 ++ kubuntu/settings.conf | 12 ++++++++---- lubuntu/modules/packages.conf | 11 ++--------- lubuntu/settings.conf | 12 ++++++++---- ubuntuunity/settings.conf | 12 ++++++++---- 10 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 common/modules/before_bootloader_mkdirs_context.conf create mode 100644 common/modules/shellprocess_before_bootloader_kerncopy.conf create mode 100644 common/modules/shellprocess_rmcdrom.conf diff --git a/common/modules/before_bootloader_context.conf b/common/modules/before_bootloader_context.conf index bc7906b..2876832 100644 --- a/common/modules/before_bootloader_context.conf +++ b/common/modules/before_bootloader_context.conf @@ -6,13 +6,17 @@ firmwareType: bios: "-/bin/true" "*": - - command: apt-cdrom add -m -d=/media/cdrom/ + - command: mkdir /tmp/calamares-cdrom-sources timeout: 10 - - command: sed -i '/deb http/d' /etc/apt/sources.list + - command: cp /etc/apt/sources.list.d/cdrom.sources /tmp/calamares-cdrom-sources/ timeout: 10 - - command: apt-get update + - command: apt-get -o Dir::Etc::sourceparts=/tmp/calamares-cdrom-sources update timeout: 10800 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi) timeout: 10800 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed timeout: 10800 + - command: rm /tmp/calamares-cdrom-sources/cdrom.sources + timeout: 10 + - command: rmdir /tmp/calamares-cdrom-sources + timeout: 10 diff --git a/common/modules/before_bootloader_mkdirs_context.conf b/common/modules/before_bootloader_mkdirs_context.conf deleted file mode 100644 index 6aeb829..0000000 --- a/common/modules/before_bootloader_mkdirs_context.conf +++ /dev/null @@ -1,10 +0,0 @@ ---- -dontChroot: true -timeout: 10 -firmwareType: - efi: - - -cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r) - - -mkdir -pv ${ROOT}/media/cdrom - - -mount --bind /cdrom ${ROOT}/media/cdrom - bios: - - -cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r) diff --git a/common/modules/mount.conf b/common/modules/mount.conf index 17be9b5..148273b 100644 --- a/common/modules/mount.conf +++ b/common/modules/mount.conf @@ -22,7 +22,7 @@ extraMounts: mountPoint: /run/systemd/resolve options: [ bind ] - device: /cdrom - mountPoint: /media/cdrom + mountPoint: /cdrom options: [ bind ] mountOptions: diff --git a/common/modules/shellprocess_before_bootloader_kerncopy.conf b/common/modules/shellprocess_before_bootloader_kerncopy.conf new file mode 100644 index 0000000..1613636 --- /dev/null +++ b/common/modules/shellprocess_before_bootloader_kerncopy.conf @@ -0,0 +1,5 @@ +--- +dontChroot: true +timeout: 10 +script: + - cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r) diff --git a/common/modules/shellprocess_rmcdrom.conf b/common/modules/shellprocess_rmcdrom.conf new file mode 100644 index 0000000..ed18dd3 --- /dev/null +++ b/common/modules/shellprocess_rmcdrom.conf @@ -0,0 +1,6 @@ +--- +dontChroot: true +timeout: 30 +script: + - rm ${ROOT}/etc/apt/sources.list.d/cdrom.sources + - rmdir ${ROOT}/cdrom diff --git a/debian/changelog b/debian/changelog index 279d04c..226c1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ calamares-settings-ubuntu (1:26.04.4) resolute; urgency=medium packages on Kubuntu and Ubuntu Unity. (LP: #2127711) * Update version numbers for OEM batch IDs and partition names for Lubuntu and Ubuntu Unity. + * Switch to supporting the livecd-rootfs-only ISO build system. (Reference: + https://discourse.ubuntu.com/t/spec-make-iso-in-livefs-build/73349) -- Aaron Rainbolt Tue, 03 Feb 2026 15:08:07 -0600 diff --git a/kubuntu/settings.conf b/kubuntu/settings.conf index 20c7c53..a56108c 100644 --- a/kubuntu/settings.conf +++ b/kubuntu/settings.conf @@ -2,9 +2,9 @@ modules-search: [ local ] instances: -- id: before_bootloader_mkdirs - module: contextualprocess - config: before_bootloader_mkdirs_context.conf +- id: before_bootloader_kerncopy + module: shellprocess + config: shellprocess_before_bootloader_kerncopy.conf - id: before_bootloader module: contextualprocess config: before_bootloader_context.conf @@ -35,6 +35,9 @@ instances: - id: fix-oem-uid module: shellprocess config: shellprocess_fix_oem_uid.conf +- id: rmcdrom + module: shellprocess + config: shellprocess_rmcdrom.conf sequence: - show: @@ -59,7 +62,7 @@ sequence: - displaymanager - networkcfg - hwclock - - contextualprocess@before_bootloader_mkdirs + - shellprocess@before_bootloader_kerncopy - shellprocess@bug-LP#1829805 - shellprocess@fixconkeys_part1 - shellprocess@fixconkeys_part2 @@ -73,6 +76,7 @@ sequence: - packages - contextualprocess@pkgselect_action - contextualprocess@pkgselect_snap_action + - shellprocess@rmcdrom - shellprocess@logs - umount - show: diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf index 00bb827..e2487ed 100644 --- a/lubuntu/modules/packages.conf +++ b/lubuntu/modules/packages.conf @@ -1,15 +1,8 @@ update_db: true backend: apt +# No remove operations are needed any longer; the squashfs containing +# live-only packages is never unpacked onto the installed system. operations: - - remove: - - "^live-*" - - calamares-settings-lubuntu - - calamares-settings-ubuntu-common - - calamares-settings-ubuntu-common-data - - calamares - - zram-config - - cifs-utils - - lubuntu-installer-prompt - try_install: - language-pack-$LOCALE - language-pack-gnome-$LOCALE diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf index 0f13cd1..4c4bf4e 100644 --- a/lubuntu/settings.conf +++ b/lubuntu/settings.conf @@ -2,9 +2,9 @@ modules-search: [ local ] instances: -- id: before_bootloader_mkdirs - module: contextualprocess - config: before_bootloader_mkdirs_context.conf +- id: before_bootloader_kerncopy + module: shellprocess + config: shellprocess_before_bootloader_kerncopy.conf - id: before_bootloader module: contextualprocess config: before_bootloader_context.conf @@ -35,6 +35,9 @@ instances: - id: fix-oem-uid module: shellprocess config: shellprocess_fix_oem_uid.conf +- id: rmcdrom + module: shellprocess + config: shellprocess_rmcdrom.conf sequence: - show: @@ -59,7 +62,7 @@ sequence: - displaymanager - networkcfg - hwclock - - contextualprocess@before_bootloader_mkdirs + - shellprocess@before_bootloader_kerncopy - automirror - shellprocess@fixconkeys_part1 - shellprocess@fixconkeys_part2 @@ -73,6 +76,7 @@ sequence: - packages - contextualprocess@pkgselect_action - contextualprocess@pkgselect_snap_action + - shellprocess@rmcdrom - shellprocess@logs - umount - show: diff --git a/ubuntuunity/settings.conf b/ubuntuunity/settings.conf index 5dcd994..c1c6dcc 100644 --- a/ubuntuunity/settings.conf +++ b/ubuntuunity/settings.conf @@ -2,9 +2,9 @@ modules-search: [ local ] instances: -- id: before_bootloader_mkdirs - module: contextualprocess - config: before_bootloader_mkdirs_context.conf +- id: before_bootloader_kerncopy + module: shellprocess + config: shellprocess_before_bootloader_kerncopy.conf - id: before_bootloader module: contextualprocess config: before_bootloader_context.conf @@ -35,6 +35,9 @@ instances: - id: fix-oem-uid module: shellprocess config: shellprocess_fix_oem_uid.conf +- id: rmcdrom + module: shellprocess + config: shellprocess_rmcdrom.conf sequence: - show: @@ -59,7 +62,7 @@ sequence: - displaymanager - networkcfg - hwclock - - contextualprocess@before_bootloader_mkdirs + - shellprocess@before_bootloader_kerncopy - shellprocess@bug-LP#1829805 - shellprocess@fixconkeys_part1 - shellprocess@fixconkeys_part2 @@ -73,6 +76,7 @@ sequence: - packages - contextualprocess@pkgselect_action - contextualprocess@pkgselect_snap_action + - shellprocess@rmcdrom - shellprocess@logs - umount - show: