Imported 2.568

No reason for CPC update specified.

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 <steve.langasek@ubuntu.com>  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

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

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)