D38813.1790929410.diff
No OneTemporary
Actions

Size

815 B

Referenced Files

None

Subscribers

None

D38813.1790929410.diff
View Options

	diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
	--- a/release/scripts/mk-vmimage.sh
	+++ b/release/scripts/mk-vmimage.sh
	@@ -97,6 +97,8 @@
	. "${VMCONFIG}"
	fi

	+ set -e
	+
	vm_create_base
	vm_install_base
	vm_extra_install_base
	diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
	--- a/release/tools/vmimage.subr
	+++ b/release/tools/vmimage.subr
	@@ -93,8 +93,8 @@

	mkdir -p ${DESTDIR}/dev
	mount -t devfs devfs ${DESTDIR}/dev
	- chroot ${DESTDIR} ${EMULATOR} /usr/bin/newaliases
	- chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart
	+ chroot ${DESTDIR} ${EMULATOR} /usr/bin/newaliases \|\| :
	+ chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart \|\| :
	umount_loop ${DESTDIR}/dev

	cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf