Merge remote-tracking branch 'xnox/fix-misisng-systemd-detect-virt' into ubuntu/master

4 years ago · 82aca610dc
parent 72f2647eb0 096a00f404
commit 82aca610dc
1 changed files with 3 additions and 1 deletions
--- a/live-build/functions
+++ b/live-build/functions
@ -417,7 +417,9 @@ undivert_grub() {
 		--divert /etc/grub.d/30_os-prober.dpkg-divert \
 		--rename /etc/grub.d/30_os-prober

-	rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	if grep -q "^exit 1$" "$CHROOT_ROOT"/usr/bin/systemd-detect-virt; then
+		rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	fi
 	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
 		--rename /usr/bin/systemd-detect-virt
 }