--- elwix/build_fs.sh	2013/07/29 15:06:58	1.7.2.1
+++ elwix/build_fs.sh	2013/07/31 14:57:01	1.7.2.7
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_fs.sh,v 1.7.2.1 2013/07/29 15:06:58 misho Exp $
+# $Id: build_fs.sh,v 1.7.2.7 2013/07/31 14:57:01 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -33,7 +33,15 @@ fi
 clean_rel()
 {
 	echo "+++ Clean ELWIX OS release ..."
-	rm -rf ${REL}/${OS}
+	rm -rf $1 $2
+
+	mkdir -p $1
+
+	if [ -d ${BASEFS} ]; then
+		cd ${BASEFS}
+		pax -rw -pe -X . $1
+		cd -
+	fi
 }
 
 build_vardir()
@@ -59,7 +67,6 @@ build_vardir()
 	install -d -o 883 -g 883 altroot/var/mqtt;
 	install -d altroot/var/named;
 	install -d altroot/var/run;
-	install -d -m 1777 altroot/var/tmp;
 	install -d altroot/var/sys;
 	install -d -o 53 -g 53 altroot/var/run/named;
 	install -d -o 101 -g 101 altroot/var/run/quagga;
@@ -69,13 +76,15 @@ build_vardir()
 	install -d -g 1 altroot/var/spool/output;
 	install -d -g 1 altroot/var/spool/output/lpd;
 
+	ln -fs /tmp altroot/var/tmp;
+
 	chown -hR root:wheel .
 	cd -
 }
 
 mkboot()
 {
-	echo "+++ Build ELWIX FS boot directory ..."
+	echo "+++ Build ELWIX OS boot directory ..."
 	InstallDir ${WORLD}/boot $1/boot
 
 	install -m 644 ${CFGDIR}/boot/boot.config $1;
@@ -97,7 +106,7 @@ mkboot()
 
 mkvar()
 {
-	echo "+++ Build ELWIX FS var directory ..."
+	echo "+++ Build ELWIX OS var directory ..."
 	touch $1/altroot/var/run/utmp
 
 	touch $1/altroot/var/account/acct
@@ -140,7 +149,8 @@ create_etc_fstab()
 # Automatic generated fstab for ELWIX$2 at ${BUILD_DATE}
 #
 /dev/ufs/elwix		/	ufs	ro			0	1
-md2			/var	mfs	rw,-s16m,-S		0       0
+md2			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
+md3			/var	mfs	rw,-s16m,-S		0       0
 _EOF
 }
 
@@ -166,6 +176,7 @@ mketc()
 	chgrp 80 $1/etc/config.xml;
 	chmod 0660 $1/etc/config.xml;
 
+	mkdir -p $1/etc/mqtt;
 	chgrp -R 883 $1/etc/mqtt;
 	chown -R 883 $1/etc/mqtt;
 
@@ -196,10 +207,10 @@ mkbackup()
 
 	cd $1
 	cp -p etc/config.xml altroot/backup
-#	tar -czf altroot/backup/.etc.tgz etc
+	tar -czf altroot/backup/.etc.tgz etc
 
-#	cd altroot
-#	tar -czf backup/.var.tgz var
+	cd altroot
+	tar -czf backup/.var.tgz var
 }
 
 mkhome()
@@ -227,14 +238,6 @@ install_rel()
 	cd -;
 
 	case "$2" in
-		_128)
-			install -d $1/usr/local
-			cd $1/usr/local
-			pax -r -z -pe -f ${REL}/${ROMFS_IMG2}
-			cd -
-
-			OSZ=${REL}/${OS_128}
-			;;
 		*)
 			OSZ=${REL}/${OS}
 			;;
@@ -245,23 +248,14 @@ install_rel()
 }
 
 ### main()
-if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS_IMG} ]; then
-	echo
-	echo "Error:: not found kernel or firmware elwix files ..."
-	echo
-	echo " For fix this issue, please re-run build_rootfs.sh or build_romfs.sh"
-	echo
-	exit 1
-fi
-
-clean_rel
-build_vardir ${ROMFS}/elwix
-mkboot ${ROMFS}
-mkhome ${ROMFS}/elwix
-mkvar ${ROMFS}/elwix
-mketc ${ROMFS}/elwix
-mkbackup ${ROMFS}/elwix
-install_rel ${ROMFS}
+clean_rel ${FS} ${REL}/${OS}
+build_vardir ${FS}/elwix
+mkhome ${FS}/elwix
+mkvar ${FS}/elwix
+mketc ${FS}/elwix
+mkbackup ${FS}/elwix
+mkboot ${FS}
+install_rel ${FS}
 
 echo "+++ Complete build ELWIX OS"
 echo "ELWIX finish version ${VERSION}, Good luck!"