Author: imp
Date: Mon Nov 28 21:29:01 2016
New Revision: 309271
URL: https://svnweb.freebsd.org/changeset/base/309271
Log:
Trying to autodetect legacy setups lead to problems when people
overrode the disk image creation routine. For now, just always bring
in the legecy defines / routines.
Modified:
head/tools/tools/nanobsd/nanobsd.sh
Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh Mon Nov 28 21:16:03 2016
(r309270)
+++ head/tools/tools/nanobsd/nanobsd.sh Mon Nov 28 21:29:01 2016
(r309271)
@@ -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...
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
