--- elwix/build_base.sh	2013/08/05 13:10:16	1.2
+++ elwix/build_base.sh	2014/09/15 19:06:42	1.3
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.2 2013/08/05 13:10:16 misho Exp $
+# $Id: build_base.sh,v 1.3 2014/09/15 19:06:42 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -33,7 +33,7 @@ fi
 clean_basefs()
 {
 	echo "+++ Clean ELWIX base firmware ..."
-	chflags -Rf noschg $BASEFS $BASE_FS
+	chflags -Rf noschg,nosunlink $BASEFS $BASE_FS
 	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS} ${REL}/kernel.gz
 }
 
@@ -56,13 +56,20 @@ build_basefs()
 	install -d elwix/altroot;
 	install -d elwix/altroot/var;
 	install -d elwix/cf;
+	case ${TARGET} in
+		i386)
+			ln -fs /dev/ada0g elwix/cf/map.cfg
+			;;
+		mips)
+			ln -fs /dev/map/cfg elwix/cf/map.cfg
+			;;
+	esac
 	install -d elwix/etc;
 	install -d -o 883 -g 883 elwix/etc/mqtt;
 	install -d elwix/exports;
 	install -d elwix/home;
 	install -d -m 0750 elwix/root;
 	install -d -m 0750 elwix/root/.ssh;
-	install -d elwix/system;
 	install -d elwix/tftpboot;
 	install -d elwix/pkg;
 	install -d elwix/pkg/bin;
@@ -74,7 +81,6 @@ build_basefs()
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
 	ln -fs /elwix/root root;
-	ln -fs /elwix/system system;
 	ln -fs /elwix/tftpboot tftpboot;
 	install -d mnt;
 	install -d -m 0555 proc;
@@ -89,6 +95,7 @@ build_basefs()
 	install -d usr/lib32;
 	install -d usr/libdata;
 	install -d usr/libexec;
+	install -d usr/libexec/casper
 	ln -fs /usr/libexec libexec;
 	install -d usr/local;
 	install -d usr/local/bin;
@@ -151,6 +158,7 @@ install_basefs()
 	InstallDir ${WORLD}/usr/local/sbin $USBIN
 	InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
+	InstallDir ${WORLD}/libexec/casper $LIBEXEC/casper
 
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
@@ -175,6 +183,7 @@ create_etc_fstab()
 /dev/ufs/elwix		/	ufs	ro			0	1
 md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
 md1			/var	mfs	rw,-s16m,-S		0       0
+/var/db			/elwix/etc	unionfs	rw,noauto,-onoatime	0	0
 _EOF
 }