mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-17 14:43:31 +00:00
Get back to using 2 layers, properly handle the install catalogue.
This commit is contained in:
parent
2c73b8c7fb
commit
ada09ac429
@ -171,6 +171,10 @@ if [ "$PROJECT" = "ubuntu-core-desktop" ]; then
|
||||
mv output/*.img pc.img
|
||||
xz -0 -T4 pc.img
|
||||
rm -rf output/
|
||||
|
||||
# Prepare the source catalogue
|
||||
cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > ../"$PREFIX".install-sources.yaml
|
||||
|
||||
# We need to rename the image file so that it can be pulled
|
||||
# by the builder.
|
||||
mv pc.img.xz ../"$PREFIX".img.xz
|
||||
|
@ -814,29 +814,12 @@ case $PROJECT in
|
||||
touch config/universe-enabled
|
||||
KERNEL_FLAVOURS='generic-hwe-22.04'
|
||||
PASSES_TO_LAYERS="true"
|
||||
|
||||
# the minimal layer, for minimal installs
|
||||
add_task minimal minimal
|
||||
# the live layer, contains all packages for the live session installer
|
||||
add_task live minimal
|
||||
add_snap live ubuntu-core-desktop-installer/classic core22 snapd
|
||||
add_package live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init
|
||||
|
||||
# now let's create the neccessary catalog files
|
||||
cat <<-EOF > config/live.catalog-in.yaml
|
||||
- default: true
|
||||
description:
|
||||
en: Ubuntu Core Desktop.
|
||||
id: ubuntu-core-desktop
|
||||
locale_support: none
|
||||
name:
|
||||
en: Ubuntu Core Desktop
|
||||
path: pc.img.xz
|
||||
type: dd-xz:file
|
||||
size: @SIZE@
|
||||
variant: core
|
||||
EOF
|
||||
|
||||
# we have to manually mark the live layer as the LIVE_PASS, since it's also
|
||||
# the only layer we build
|
||||
LIVE_PASS=live
|
||||
add_snap minimal.live ubuntu-core-desktop-installer/classic core22 snapd
|
||||
add_package minimal.live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init
|
||||
;;
|
||||
|
||||
ubuntu-oem)
|
||||
|
Loading…
x
Reference in New Issue
Block a user