Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final fix to 999-ubuntu-image-customization.chroot, tested to be working.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-09-19 14:03:14 +02:00
parent c4ef397428
commit 1f8f86c17c
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.613) UNRELEASED; urgency=medium
* 999-ubuntu-image-customization.chroot: use IMAGEFORMAT=none for the checks
instead of ubuntu-image, as that is what is used during ubuntu-image rootfs
builds.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 19 Sep 2019 11:27:12 +0200
livecd-rootfs (2.612) eoan; urgency=medium livecd-rootfs (2.612) eoan; urgency=medium
* Hopefully the last fix for 999-ubuntu-image-customization.chroot: use * Hopefully the last fix for 999-ubuntu-image-customization.chroot: use

2
live-build/auto/config
View File

@ -405,6 +405,8 @@ case $IMAGEFORMAT in
;; ;;
none) none)
# Currently the IMAGEFORMAT none format is used only for ubuntu-image
# targeted image builds which, currently, only target physical devices.
OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
;; ;;
*) *)

4
live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot
View File

@ -3,12 +3,12 @@
. /root/config/chroot . /root/config/chroot
# Specific ubuntu-image chroot configuration goes here. # Specific ubuntu-image chroot configuration goes here.
# Currently the ubuntu-image IMAGEFORMAT is equivalent to building an image # Currently the none IMAGEFORMAT is equivalent to building a rootfs for an image
# for a physical device, not a cloud instance. For such images we want some # for a physical device, not a cloud instance. For such images we want some
# special cloud-init configuration that should not be happening for cloud # special cloud-init configuration that should not be happening for cloud
# cases. This check should be changed to a per-MODEL/per-SUBARCH check once # cases. This check should be changed to a per-MODEL/per-SUBARCH check once
# we support building cloud images via ubuntu-image. # we support building cloud images via ubuntu-image.
if [ "$IMAGEFORMAT" == "ubuntu-image" ]; then if [ "$IMAGEFORMAT" == "none" ]; then
# If the cloud does not provide a meta-data service this should be run # If the cloud does not provide a meta-data service this should be run
# This will setup a nocloud datasource on the boot partition. # This will setup a nocloud datasource on the boot partition.
# This is the default behavior for our ubuntu-image built preinstalled # This is the default behavior for our ubuntu-image built preinstalled