--- elwix/build_base.sh	2013/07/31 16:15:53	1.1.2.7
+++ elwix/build_base.sh	2014/09/11 22:55:36	1.2.6.5
@@ -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.7 2013/07/31 16:15:53 misho Exp $
+# $Id: build_base.sh,v 1.2.6.5 2014/09/11 22:55:36 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;
@@ -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
 }
@@ -173,11 +181,33 @@ 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
 }
 
+install_fs()
+{
+	echo "+++ Install ELWIX base $1 in bundle OS install file ..."
+	OSZ=""
+
+	install -v ${KERNEL} $1/boot/kernel;
+	cd $1/boot/kernel;
+	gzip -9 kernel;
+	cp kernel.gz ${REL}
+	cd -;
+
+	case "$2" in
+		*)
+			OSZ=${REL}/${BASE_OS}
+			;;
+	esac
+
+	cd $1
+	tar -czvf $OSZ .
+}
+
 ### main()
 clean_basefs
 build_basefs
@@ -191,5 +221,7 @@ MakeFS_var ${BASE_FS}/elwix ${BASE_ETC}
 MakeFS_etc ${BASE_FS}/elwix ${BASE_ETC} base
 create_etc_fstab ${BASE_FS}/elwix base
 MakeFS_backup ${BASE_FS}/elwix
+MakeFS_boot ${BASE_FS}
+install_fs ${BASE_FS}
 
 echo "+++ Complete build ELWIX base"