--- elwix/build_base.sh	2013/07/31 16:24:40	1.1.2.9
+++ elwix/build_base.sh	2016/11/03 14:13:30	1.3.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.1.2.9 2013/07/31 16:24:40 misho Exp $
+# $Id: build_base.sh,v 1.3.2.1 2016/11/03 14:13:30 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -33,8 +33,8 @@ fi
 clean_basefs()
 {
 	echo "+++ Clean ELWIX base firmware ..."
-	chflags -Rf noschg $BASEFS $BASE_FS
-	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS}
+	chflags -Rf noschg,nosunlink $BASEFS $BASE_FS
+	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS} ${REL}/kernel.gz
 }
 
 build_basefs()
@@ -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;
@@ -137,10 +143,10 @@ install_basefs()
 
 	find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \;
 
-	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
 	find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \;
 	find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \;
-	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/usr/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
 	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
 
 	InstallList ${ELWIX_BASEFS} ${WORLD} ${BASEFS}
@@ -173,8 +179,9 @@ create_etc_fstab()
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
 /dev/ufs/elwix		/	ufs	ro			0	1
-md2			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
-md3			/var	mfs	rw,-s16m,-S		0       0
+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
 }
 
@@ -186,11 +193,12 @@ install_fs()
 	install -v ${KERNEL} $1/boot/kernel;
 	cd $1/boot/kernel;
 	gzip -9 kernel;
+	cp kernel.gz ${REL}
 	cd -;
 
 	case "$2" in
 		*)
-			OSZ=${REL}/${OS}
+			OSZ=${REL}/${BASE_OS}
 			;;
 	esac