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.
This commit is contained in:
imp 2016-11-28 21:29:01 +00:00
parent 3dd66211e3
commit e9a03f5b94

View File

@ -44,9 +44,9 @@ do_installworld=true
do_image=true do_image=true
do_copyout_partition=true do_copyout_partition=true
do_native_xtools=false do_native_xtools=false
# Don't do the legacy build unless we detect 'old' variables being
# set. # Pull in legacy stuff for now automatically
do_legacy=false . "${topdir}/legacy.sh"
set +e set +e
args=`getopt BKXWbc:fhiknqvw $*` args=`getopt BKXWbc:fhiknqvw $*`
@ -134,15 +134,6 @@ if [ $# -gt 0 ] ; then
usage usage
fi 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... # And then it is as simple as that...