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

Backport the 999-ubuntu-image-customization changes, add a delta on top to still support the old legacy raspi2 images.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-10-23 12:41:40 +02:00
parent f8dd8502ce
commit ce1b1cf815
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -2,8 +2,11 @@ livecd-rootfs (2.525.32) UNRELEASED; urgency=medium
* Fix a terrible typo in auto/build that causes all core18 builds to fail on * Fix a terrible typo in auto/build that causes all core18 builds to fail on
this series (LP: #1849343). this series (LP: #1849343).
* Backport 999-ubuntu-image-customization.chroot to have a common place for
our cloud-init datasource. Add some modifications on top to make sure the
legacy raspi2 configuration stays the same. (LP: #1849472)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 22 Oct 2019 17:09:57 +0200 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 22 Oct 2019 17:34:31 +0200
livecd-rootfs (2.525.31) bionic; urgency=medium livecd-rootfs (2.525.31) bionic; urgency=medium

2
live-build/auto/config
View File

@ -930,6 +930,8 @@ echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
echo "IMAGEFORMAT=\"$IMAGEFORMAT\"" >> config/chroot
echo "SUBARCH=\"$SUBARCH\"" >> config/chroot
case $ARCH+$SUBARCH in case $ARCH+$SUBARCH in
armhf+raspi2|armhf+raspi3|arm64+raspi3) armhf+raspi2|armhf+raspi3|arm64+raspi3)

25
live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
View File

@ -142,22 +142,17 @@ fi
#### END COMMON ARCH FUNCTIONS #### END COMMON ARCH FUNCTIONS
case $arch in case $arch+${SUBARCH:-} in
# ARM images are special # raspi2 images are special
armhf|arm64) armhf+raspi2)
# Dirty hack because SUBARCH doesn't exist when running chroot hooks, fake_cloud_init
# and we don't want raspi2 images to depend on a cloud data source: echo "Image architecture is ARM. Existing vmbuilder-fixups"
if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then exit 0
fake_cloud_init ;;
fi
echo "Image architecture is ARM. Existing vmbuilder-fixups" armhf+*|arm64+*|powerpc+*|ppc64el+*|s390x+*)
exit 0
exit 0 ;;
;;
powerpc|ppc64el|s390x)
exit 0
;;
esac esac
psuedo_grub_probe() { psuedo_grub_probe() {

23
live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash -ex
. /root/config/chroot
# Specific ubuntu-image chroot configuration goes here.
# 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
# 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
# we support building cloud images via ubuntu-image.
if [ "$IMAGEFORMAT" == "none" ]; then
# 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 is the default behavior for our ubuntu-image built preinstalled
# images.
cat << EOF > /etc/cloud/cloud.cfg.d/99-fake_cloud.cfg
# configure cloud-init for NoCloud
datasource_list: [ NoCloud, None ]
datasource:
NoCloud:
fs_label: system-boot
EOF
fi