Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2026-02-24 09:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to supporting the livecd-rootfs-only ISO build system

Browse Source
This commit is contained in:
Aaron Rainbolt 2026-02-23 18:18:31 -05:00
parent 8d65fbe58e
commit 73042a91a6
Signed by: arraybolt3
GPG Key ID: 39ADDC9EE23AEB08
10 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/modules/before_bootloader_context.conf
View File

@ -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

10
common/modules/before_bootloader_mkdirs_context.conf
View File

@ -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)

2
common/modules/mount.conf
View File

@ -22,7 +22,7 @@ extraMounts:
mountPoint: /run/systemd/resolve
options: [ bind ]
- device: /cdrom
mountPoint: /media/cdrom
mountPoint: /cdrom
options: [ bind ]
mountOptions:

5
common/modules/shellprocess_before_bootloader_kerncopy.conf Normal file
View File

@ -0,0 +1,5 @@
---
dontChroot: true
timeout: 10
script:
- cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r)

6
common/modules/shellprocess_rmcdrom.conf Normal file
View File

@ -0,0 +1,6 @@
---
dontChroot: true
timeout: 30
script:
- rm ${ROOT}/etc/apt/sources.list.d/cdrom.sources
- rmdir ${ROOT}/cdrom

2
debian/changelog vendored
View File

@ -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 <arraybolt3@ubuntu.com> Tue, 03 Feb 2026 15:08:07 -0600

12
kubuntu/settings.conf
View File

@ -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:

11
lubuntu/modules/packages.conf
View File

@ -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

12
lubuntu/settings.conf
View File

@ -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:

12
ubuntuunity/settings.conf
View File

@ -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: