D58962.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D58962.diff
View Options

	diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
	--- a/tools/tools/nanobsd/embedded/common
	+++ b/tools/tools/nanobsd/embedded/common
	@@ -651,10 +651,7 @@
	}

	# These don't make any sense to this strategy, so stub them out.
	-create_code_slice() {
	-}
	-
	-_create_code_slice() {
	+create_code_partition() {
	}

	# Each major disk scheme has its own routine. Generally
	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
	@@ -103,6 +103,14 @@
	' > ${NANO_LOG}/_.partitioning
	}

	+create_code_partition() {
	+ if [ -z "${NANO_NOPRIV_BUILD}" ]; then
	+ create_code_slice
	+ else
	+ _create_code_slice
	+ fi
	+}
	+
	#
	# Create a BSD-labeled root code partition image using mdconfig/gpart,
	# populate it from NANO_WORLDDIR, and write _.disk.image
	diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
	--- a/tools/tools/nanobsd/nanobsd.sh
	+++ b/tools/tools/nanobsd/nanobsd.sh
	@@ -261,11 +261,7 @@
	fi
	if $do_code; then
	calculate_partitioning
	- if [ -z "${NANO_NOPRIV_BUILD}" ]; then
	- create_code_slice
	- else
	- _create_code_slice
	- fi
	+ create_code_partition
	if $do_image; then
	if [ -z "${NANO_NOPRIV_BUILD}" ]; then
	create_diskimage