diff --git a/debian/changelog b/debian/changelog
index 19cd495d..a38db801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ livecd-rootfs (2.568) UNRELEASED; urgency=medium
   * 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.
+
  -- Tobias Koch <tobias.koch@canonical.com>  Wed, 27 Feb 2019 10:16:46 +0100
 
 livecd-rootfs (2.567) disco; urgency=medium
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