D48780.id169958.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48780.id169958.diff
View Options

	diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
	--- a/tools/tools/nanobsd/defaults.sh
	+++ b/tools/tools/nanobsd/defaults.sh
	@@ -812,7 +812,7 @@
	mount -t nullfs -o noatime -o ro ${NANO_PACKAGE_DIR} ${NANO_WORLDDIR}/_.p
	mount -t devfs devfs ${NANO_WORLDDIR}/dev

	- trap "umount ${NANO_WORLDDIR}/dev; umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
	+ trap "nano_umount ${NANO_WORLDDIR}/dev; nano_umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT

	# Install pkg-* package
	CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
	@@ -837,8 +837,8 @@
	CR0 "${PKGCMD} info"

	trap - 1 2 15 EXIT
	- umount ${NANO_WORLDDIR}/dev
	- umount ${NANO_WORLDDIR}/_.p
	+ nano_umount ${NANO_WORLDDIR}/dev
	+ nano_umount ${NANO_WORLDDIR}/_.p
	rm -xrf ${NANO_WORLDDIR}/_.p
	}

	diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
	--- a/tools/tools/nanobsd/legacy.sh
	+++ b/tools/tools/nanobsd/legacy.sh
	@@ -113,7 +113,7 @@
	-y ${NANO_HEADS}`
	fi

	- trap "echo 'Running exit trap code' ; df -i ${MNT} ; umount ${MNT} \|\| true ; mdconfig -d -u $MD" 1 2 15 EXIT
	+ trap "echo 'Running exit trap code' ; df -i ${MNT} ; nano_umount ${MNT} \|\| true ; mdconfig -d -u $MD" 1 2 15 EXIT

	gpart create -s bsd "${MD}"
	gpart add -t freebsd-ufs -b 16 "${MD}"