Index: /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden
===================================================================
--- /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden	(revision 10383)
+++ /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden	(revision 10384)
@@ -32,19 +32,20 @@
 # Dirty quirk to allow comments in part below
 PACKAGE_LIST=`cat <<EOF | sed 's/#.*$//g'
+$PORTSDIR/benchmarks/iperf
+$PORTSDIR/devel/py-yaml
 $PORTSDIR/dns/dnsmasq
-$PORTSDIR/www/thttpd
 $PORTSDIR/editors/vim-lite
+$PORTSDIR/ftp/curl
 $PORTSDIR/lang/python
 $PORTSDIR/net-mgmt/net-snmp
-$PORTSDIR/benchmarks/iperf
 $PORTSDIR/net/pen 
-$PORTSDIR/devel/py-yaml
+$PORTSDIR/net/sixxs-aiccu
+$PORTSDIR/security/nmap
+$PORTSDIR/security/openvpn
+$PORTSDIR/security/sudo
+$PORTSDIR/sysutils/screen
 $PORTSDIR/sysutils/ucspi-tcp
+$PORTSDIR/www/thttpd
 $PORTSDIR/www/tinyproxy
-$PORTSDIR/editors/vim-lite
-$PORTSDIR/security/nmap
-$PORTSDIR/ftp/curl
-$PORTSDIR/security/openvpn
-$PORTSDIR/net/sixxs-aiccu
 
 
@@ -337,4 +338,8 @@
 customize_cmd cust_apply_nanobsd_patches
 
+# Standard overwrite
+if [ -r "$NANO_CONF_DIR/nanobsd.local" ]; then
+ . $NANO_CONF_DIR/nanobsd.local
+fi
 
 # Extra config if existing is not suffient
Index: /branches/releng-9.0/nanobsd/tools/image-build.sh
===================================================================
--- /branches/releng-9.0/nanobsd/tools/image-build.sh	(revision 10383)
+++ /branches/releng-9.0/nanobsd/tools/image-build.sh	(revision 10384)
@@ -4,8 +4,7 @@
 
 BASEDIR=`dirname $0`
-CFG="${BASEDIR}/../cfg/nanobsd.wleiden"
-NANOBSD='/usr/src/tools/tools/nanobsd/nanobsd.sh'
+. ${BASEDIR}/package-build.inc.sh
 
-. ${BASEDIR}/package-build.inc.sh
+NANOBSD="$NANO_SRC/tools/tools/nanobsd/nanobsd.sh"
 
 FORCE_KERNEL=0
@@ -36,5 +35,4 @@
 
 # Find object directory 
-eval `grep '^NANO_NAME=' ${CFG}`
 OBJDIR="/usr/obj/nanobsd.${NANO_NAME}"
 
@@ -62,5 +60,5 @@
 
 # Provide verbose output by default
-COMMAND="${NANOBSD}  ${NANOBSD_FLAGS} -c ${CFG} -v ${NANOBSD_EXTRA}"
+COMMAND="${NANOBSD} ${NANOBSD_FLAGS} -c ${NANO_CFG_FILE} -v ${NANOBSD_EXTRA}"
 f_time ${COMMAND}
 RETVAL=$?