Index: /branches/releng-10/nanobsd/cfg/nanobsd.wleiden
===================================================================
--- /branches/releng-10/nanobsd/cfg/nanobsd.wleiden	(revision 13171)
+++ /branches/releng-10/nanobsd/cfg/nanobsd.wleiden	(revision 13174)
@@ -39,5 +39,5 @@
 benchmarks/iperf
 devel/py-yaml
-dns/dnsmasq
+#dns/dnsmasq
 ftp/curl
 lang/python2
@@ -215,5 +215,5 @@
 	if [ -n "${CFG_ROOT_PASSWORD}" ]; then
 		pprint 2 "Set root password using CFG_ROOT_PASSWORD variable"
-		chroot ${NANO_WORLDDIR} sh -c "echo '${CFG_ROOT_PASSWORD}' | pw usermod -h 0 -u root"
+		chroot ${NANO_WORLDDIR} sh -c "echo '${CFG_ROOT_PASSWORD}' | pw usermod -h 0 -n root"
 	else
         	pprint 2 "Root password is <blank>, no password provided at variable CFG_ROOT_PASSWORD"
Index: /branches/releng-10/nanobsd/cfg/nanobsd.wleiden.apu
===================================================================
--- /branches/releng-10/nanobsd/cfg/nanobsd.wleiden.apu	(revision 13171)
+++ /branches/releng-10/nanobsd/cfg/nanobsd.wleiden.apu	(revision 13174)
@@ -40,5 +40,5 @@
 benchmarks/iperf
 devel/py-yaml
-dns/dnsmasq
+#dns/dnsmasq
 ftp/curl
 lang/python2