--- elwix/build_base.sh	2013/07/31 15:13:17	1.1.2.3
+++ elwix/build_base.sh	2014/01/21 09:21:55	1.2.6.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.1.2.3 2013/07/31 15:13:17 misho Exp $
+# $Id: build_base.sh,v 1.2.6.3 2014/01/21 09:21:55 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
-	rm -rf $BASEFS
+	chflags -Rf noschg $BASEFS $BASE_FS
+	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS} ${REL}/kernel.gz
 }
 
 build_basefs()
@@ -62,7 +62,6 @@ build_basefs()
 	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 +73,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;
@@ -155,10 +153,64 @@ install_basefs()
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
 
+prepare_fs()
+{
+	echo "+++ Prepare ELWIX fs ..."
+	mkdir -p $1
+
+	if [ -d ${BASEFS} ]; then
+		cd ${BASEFS}
+		pax -rw -pe -X . $1
+		cd -
+	fi
+}
+
+create_etc_fstab()
+{
+	cat >$1/etc/fstab <<_EOF
+# Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
+#
+/dev/ufs/elwix		/	ufs	ro			0	1
+md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
+md1			/var	mfs	rw,-s16m,-S		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
 
 install_basefs
+
+# build fs
+prepare_fs ${BASE_FS}
+MakeFS_home ${BASE_FS}/elwix
+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"