aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2016-11-28 21:29:01 +0000
committerWarner Losh <imp@FreeBSD.org>2016-11-28 21:29:01 +0000
commit75aa5f28e94d718c8a1522d00b831189c197454f (patch)
tree9dc2adaae736d9f97809202327cc7ff92f0e0cac /tools
parent114b7c00ca516f79561776d87fba3630d6fe3746 (diff)
Notes
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tools/nanobsd/nanobsd.sh15
1 files changed, 3 insertions, 12 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 918dd6b501566..07aa1ce053695 100755
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -44,9 +44,9 @@ do_installworld=true
do_image=true
do_copyout_partition=true
do_native_xtools=false
-# Don't do the legacy build unless we detect 'old' variables being
-# set.
-do_legacy=false
+
+# Pull in legacy stuff for now automatically
+. "${topdir}/legacy.sh"
set +e
args=`getopt BKXWbc:fhiknqvw $*`
@@ -134,15 +134,6 @@ if [ $# -gt 0 ] ; then
usage
fi
-if [ -n "$NANO_HEADS" -o -n "$NANO_SECTS" ]; then
- do_legacy=true
-fi
-
-# If this uses the old, legacy image system, pull that in as well
-if $do_legacy ; then
- . "${topdir}/legacy.sh"
-fi
-
#######################################################################
# And then it is as simple as that...