--- elwix/build_fs.sh	2012/10/11 13:31:33	1.3.2.14
+++ elwix/build_fs.sh	2013/07/29 15:28:23	1.7.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_fs.sh,v 1.3.2.14 2012/10/11 13:31:33 misho Exp $
+# $Id: build_fs.sh,v 1.7.2.2 2013/07/29 15:28:23 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -30,22 +30,23 @@ if [ "${USER}" != "root" ]; then
 	exit 1
 fi
 
-clean_fsdir()
+clean_rel()
 {
-	echo "+++ Clean ELWIX FS ..."
-	rm -rf ${FS} ${FS_LITE}
+	echo "+++ Clean ELWIX OS release ..."
+	rm -rf $1 $2
 
-	echo "+++ Clean ELWIX FS release ..."
-	rm -rf ${REL}/${OS} ${REL}/${OS_LITE}
+	mkdir -p $1
+
+	cd ${ROMFS}
+	pax -rw -pe -X . $1
+	cd -
 }
 
-build_fsdir()
+build_vardir()
 {
-	echo "+++ Build ELWIX FS directory ..."
-	mkdir -p $1
+	echo "+++ Build ELWIX altroot directory ..."
 
 	cd $1
-
 # altroot
 	install -d altroot;
 	# altroot/var
@@ -61,8 +62,10 @@ build_fsdir()
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
 	install -d -o 101 -g 101 altroot/var/log/quagga;
+	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;
@@ -71,24 +74,6 @@ build_fsdir()
 	install -d -g 1 altroot/var/spool/lpd;
 	install -d -g 1 altroot/var/spool/output;
 	install -d -g 1 altroot/var/spool/output/lpd;
-# boot
-	install -d boot;
-# cf
-	install -d cf;
-# etc
-	install -d etc;
-# exports
-	install -d exports;
-# home
-	install -d home;
-# root
-	install -d -m 0700 root;
-# pkg
-	install -d pkg;
-	install -d pkg/db;
-	install -d pkg/lib;
-# tftpboot
-	install -d tftpboot;
 
 	chown -hR root:wheel .
 	cd -
@@ -96,7 +81,7 @@ build_fsdir()
 
 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;
@@ -118,20 +103,21 @@ mkboot()
 
 mkvar()
 {
-	echo "+++ Build ELWIX FS var directory ..."
-	ln -s /tmp $1/altroot/var/tmp
+	echo "+++ Build ELWIX OS var directory ..."
+	touch $1/altroot/var/run/utmp
 
+	touch $1/altroot/var/account/acct
+
 	touch $1/altroot/var/log/elwix
 	touch $1/altroot/var/log/lastlog
 	touch $1/altroot/var/log/wifi.log
-	touch $1/altroot/var/log/wtmp
-	touch $1/altroot/var/run/utmp
-	touch $1/altroot/var/account/acct
+	touch $1/altroot/var/log/utx.log
 
 	touch $1/altroot/var/log/auth.log
 	touch $1/altroot/var/log/cron
 	touch $1/altroot/var/log/console.log
 	touch $1/altroot/var/log/debug.log
+	touch $1/altroot/var/log/init.log
 	touch $1/altroot/var/log/lpd-errs
 	touch $1/altroot/var/log/maillog
 	touch $1/altroot/var/log/messages
@@ -159,15 +145,14 @@ create_etc_fstab()
 	cat >$1 <<_EOF
 # Automatic generated fstab for ELWIX$2 at ${BUILD_DATE}
 #
-/dev/ufs/elwix		/elwix	ufs	ro			0	1
-md3			/tmp	mfs	rw,-s8m,-oasync,-S	0       0
-md4			/var	mfs	rw,-s16m,-S		0       0
+/dev/ufs/elwix		/	ufs	ro			0	1
+md2			/var	mfs	rw,-s16m,-S		0       0
 _EOF
 }
 
 mketc()
 {
-	echo "+++ Build ELWIX FS etc directory ..."
+	echo "+++ Build ELWIX OS etc directory ..."
 	InstallDir ${FS_ETC} $1/etc
 
 	chown -R root:wheel $1/etc;
@@ -187,6 +172,10 @@ 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;
+
 	ln -sf /etc/rc.s $1/etc/rc.S
 
 	ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
@@ -209,20 +198,20 @@ mketc()
 
 mkbackup()
 {
-	echo "+++ Build ELWIX FS backup factory default directory ..."
+	echo "+++ Build ELWIX OS backup factory default directory ..."
 	mkdir -p $1/altroot/backup
 
 	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()
 {
-	echo "+++ Build ELWIX FS root home directory ..."
+	echo "+++ Build ELWIX OS root home directory ..."
 	install -d $1/root/.ssh
 	[ -r ${CFGDIR}/root.skel/ssh/authorized_keys2 ] && \
 		install -v ${CFGDIR}/root.skel/ssh/authorized_keys2 $1/root/.ssh;
@@ -234,32 +223,30 @@ mkhome()
 	install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc;
 }
 
-install_fsdir()
+install_rel()
 {
-	echo "+++ Install ELWIX FS $1 in bundle OS install file ..."
+	echo "+++ Install ELWIX OS $1 in bundle OS install file ..."
 	OSZ=""
 
-	install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel
+	install -v ${KERNEL} $1/boot/kernel;
+	cd $1/boot/kernel;
+	gzip -9 kernel;
+	cd -;
 
-	if [ -z "$2" ]; then
-		install -v ${REL}/${ROMFS_IMG} $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
-		ln $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG}
-		ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG}
+	case "$2" in
+		_128)
+			install -d $1/usr/local
+			cd $1/usr/local
+			pax -r -z -pe -f ${REL}/${ROMFS_IMG2}
+			cd -
 
-		install -v ${REL}/${ROMFS_IMG2} $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH}
-		ln $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG2}
-		ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG2}
+			OSZ=${REL}/${OS_128}
+			;;
+		*)
+			OSZ=${REL}/${OS}
+			;;
+	esac
 
-		OSZ=${REL}/${OS}
-	else
-		install -d $1/usr
-		cd $1/usr
-		pax -r -z -pe -f ${REL}/${ROMFS_IMG}
-		cd -
-
-		OSZ=${REL}/${OS_LITE}
-	fi
-
 	cd $1
 	tar -czvf $OSZ .
 }
@@ -274,28 +261,29 @@ if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS
 	exit 1
 fi
 
-clean_fsdir
+clean_rel ${FS} ${REL}/${OS}
+clean_rel ${FS_128} ${REL}/${OS_128}
 
-build_fsdir ${FS}
-build_fsdir ${FS_LITE}
+build_vardir ${FS}/elwix
+build_vardir ${FS_128}/elwix
 
-mkboot ${FS}
-mkboot ${FS_LITE}
+mkhome ${FS}/elwix
+mkhome ${FS_128}/elwix
 
-mkhome ${FS}
-mkhome ${FS_LITE}
+mkvar ${FS}/elwix
+mkvar ${FS_128}/elwix
 
-mkvar ${FS}
-mkvar ${FS_LITE}
+mketc ${FS}/elwix
+mketc ${FS_128}/elwix
 
-mketc ${FS}
-mketc ${FS_LITE} "_lite"
+mkbackup ${FS}/elwix
+mkbackup ${FS_128}/elwix
 
-mkbackup ${FS}
-mkbackup ${FS_LITE}
+mkboot ${FS}
+mkboot ${FS_128}
 
-install_fsdir ${FS}
-install_fsdir ${FS_LITE} "_lite"
+install_rel ${FS}
+install_rel ${FS_128} _128
 
-echo "+++ Complete build ELWIX FS"
+echo "+++ Complete build ELWIX OS"
 echo "ELWIX finish version ${VERSION}, Good luck!"