From 28fb8de9ea2f448c37a8233cbd22f1ea71b3aaff Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 13 Sep 2019 15:00:07 +0000 Subject: [PATCH] Imported 2.611 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/lb_chroot_layered | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13b59e2c..9cba752b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.611) eoan; urgency=medium + + * Execute chroot_hacks in live layer only. + * lb_chroot_layered: also snap_validate_seed after all snaps are seeded + + -- Dimitri John Ledkov Fri, 13 Sep 2019 12:37:25 +0100 + livecd-rootfs (2.610) eoan; urgency=medium * Fix a typo in the 999-ubuntu-image-customization.chroot hook. diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered index 22d50bdb..44429472 100755 --- a/live-build/lb_chroot_layered +++ b/live-build/lb_chroot_layered @@ -89,8 +89,9 @@ lb_chroot_install_snaps () { snap_prepare chroot while read snap; do - snap_preseed chroot "${snap}" + SNAP_NO_VALIDATE_SEED=1 snap_preseed chroot "${snap}" done < $snaplist_file + snap_validate_seed chroot } lb_chroot_includes () { @@ -239,7 +240,9 @@ create_chroot_pass () { # layered mode is to create an initrd on each layer with a significant # impact on image size (+30MB per layer). This is an issue even with # update-initramfs disabled. - lb chroot_hacks ${*} + if $(is_live_layer $pass); then + lb chroot_hacks ${*} + fi lb chroot_interactive ${*}