From c7f3374f9f47675186fa671f6002b1edd096f9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 16 Sep 2019 14:46:04 +0200 Subject: [PATCH] Final changes to the 999-ubuntu-image-customization.chroot hook. --- debian/changelog | 8 ++++++++ live-build/auto/config | 1 + .../hooks.d/chroot/999-ubuntu-image-customization.chroot | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cba752b..b315683a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.612) UNRELEASED; urgency=medium + + * Hopefully the last fix for 999-ubuntu-image-customization.chroot: use + config/chroot to pass IMAGEFORMAT instead of config/common, as only that + file is updated with the right contents when the chroot hooks are run. + + -- Łukasz 'sil2100' Zemczak Mon, 16 Sep 2019 14:07:01 +0200 + livecd-rootfs (2.611) eoan; urgency=medium * Execute chroot_hacks in live layer only. diff --git a/live-build/auto/config b/live-build/auto/config index d851e453..eccf4676 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -974,6 +974,7 @@ fi echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/chroot +echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/chroot if [ -n "$PASSES" ]; then echo "PASSES=\"$PASSES\"" >> config/common fi diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot index 75a5313f..57ddc00e 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot @@ -1,6 +1,6 @@ #!/bin/bash -ex -. /root/config/common +. /root/config/chroot # Specific ubuntu-image chroot configuration goes here. # Currently the ubuntu-image IMAGEFORMAT is equivalent to building an image