From 9cda759d894d4ef7e61fcd3bb313a222b49bfde1 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Tue, 12 Mar 2019 03:26:07 +0000 Subject: [PATCH] Imported 2.568 No reason for CPC update specified. --- debian/changelog | 12 ++++++++++++ live-build/auto/build | 2 ++ snap-tool | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d3858ce1..48ee3743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.568) disco; urgency=medium + + [ Tobias Koch ] + * Make sure snap-tool exits with non-zero exit status, if a problem + occurred. + + [ Steve Langasek ] + * divert grub when calling into lb chroot, to avoid any problems from + grub-probe. + + -- Steve Langasek Mon, 11 Mar 2019 18:14:46 -0700 + livecd-rootfs (2.567) disco; urgency=medium * Fix change to ignore ubiquity packages, it failed to mark anything diff --git a/live-build/auto/build b/live-build/auto/build index b4bd0094..3a964636 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -261,12 +261,14 @@ EOF chmod +x chroot/usr/bin/man fi + divert_grub chroot if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb chroot_layered "$@" else divert_update_initramfs lb chroot "$@" fi + undivert_grub chroot # Let all configuration non multi-layered project here. # If those are moving to a multi-layer layout, this needs to be diff --git a/snap-tool b/snap-tool index 0aace8dc..7f0323a5 100755 --- a/snap-tool +++ b/snap-tool @@ -392,7 +392,8 @@ class SnapCli: if __name__ == "__main__": try: - SnapCli()(sys.argv[1:]) + rval = SnapCli()(sys.argv[1:]) except KeyboardInterrupt: sys.stderr.write("snap-tool: caught keyboard interrupt, exiting.\n") sys.exit(EXIT_ERR) + sys.exit(rval)