--- elwix/build_fs.sh	2012/03/20 16:12:44	1.3.2.5
+++ elwix/build_fs.sh	2013/01/28 01:47:34	1.5
@@ -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.5 2012/03/20 16:12:44 misho Exp $
+# $Id: build_fs.sh,v 1.5 2013/01/28 01:47:34 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -33,18 +33,18 @@ fi
 clean_fsdir()
 {
 	echo "+++ Clean ELWIX FS ..."
-	rm -rf ${FS}
+	rm -rf ${FS} ${FS_LITE} ${FS_LITE128}
 
 	echo "+++ Clean ELWIX FS release ..."
-	rm -rf ${REL}/${OS}
+	rm -rf ${REL}/${OS} ${REL}/${OS_LITE} ${REL}/${OS_LITE128}
 }
 
 build_fsdir()
 {
 	echo "+++ Build ELWIX FS directory ..."
-	mkdir -p ${FS}
+	mkdir -p $1
 
-	cd ${FS}
+	cd $1
 
 # altroot
 	install -d altroot;
@@ -54,30 +54,31 @@ build_fsdir()
 	install -d altroot/var/at;
 	install -d altroot/var/at/jobs;
 	install -d altroot/var/at/spool;
-	install -d -g authpf -m 0770 altroot/var/authpf;
+	install -d -g 63 -m 0770 altroot/var/authpf;
 	install -d -m 0750 altroot/var/cron;
 	install -d -m 0700 altroot/var/cron/tabs;
 	install -d altroot/var/db;
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
-	install -d -o www -g www altroot/var/log/lighttpd;
-	install -d -o quagga -g quagga altroot/var/log/quagga;
+	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 -o www -g www altroot/var/run/lighttpd;
-	install -d -o bind -g bind altroot/var/run/named;
-	install -d -o quagga -g quagga altroot/var/run/quagga;
+	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;
 	install -d altroot/var/spool;
-	install -d -o uucp -g dialer -m 0775 altroot/var/spool/lock;
-	install -d -g daemon altroot/var/spool/lpd;
-	install -d -g daemon altroot/var/spool/output;
-	install -d -g daemon altroot/var/spool/output/lpd;
+	install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock;
+	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;
+	install -d -o 883 -g 883 etc/mqtt;
 # exports
 	install -d exports;
 # home
@@ -87,6 +88,7 @@ build_fsdir()
 # pkg
 	install -d pkg;
 	install -d pkg/db;
+	install -d pkg/lib;
 # tftpboot
 	install -d tftpboot;
 
@@ -121,17 +123,20 @@ mkvar()
 	echo "+++ Build ELWIX FS var directory ..."
 	ln -s /tmp $1/altroot/var/tmp
 
+	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
@@ -147,7 +152,7 @@ mkvar()
 
 create_etc_motd()
 {
-	ELWIX_VER="ELWIX-${VERSION}_${TARGET_ARCH}";
+	ELWIX_VER="ELWIX$2-${VERSION}_${TARGET_ARCH}";
 	ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}";
 
 	awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \
@@ -157,7 +162,7 @@ create_etc_motd()
 create_etc_fstab()
 {
 	cat >$1 <<_EOF
-# Automatic generated fstab for ELWIX at ${BUILD_DATE}
+# 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
@@ -184,9 +189,12 @@ mketc()
 
 	chmod 0440 $1/etc/sudoers;
 
-	chgrp www $1/etc/config.xml;
+	chgrp 80 $1/etc/config.xml;
 	chmod 0660 $1/etc/config.xml;
 
+	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;
@@ -199,12 +207,12 @@ mketc()
 
 	echo ${TARGET_ARCH} >$1/etc/platform;
 
-	create_etc_motd $1/etc/motd;
-	create_etc_fstab $1/etc/fstab;
+	create_etc_motd $1/etc/motd $2;
+	create_etc_fstab $1/etc/fstab $2;
 
 	echo "+++ ELWIX clean CVS tags ..."
-	CleanCVS ${FS}
-	CleanCVS ${FS}/etc
+	CleanCVS $1
+	CleanCVS $1/etc
 }
 
 mkbackup()
@@ -213,8 +221,9 @@ mkbackup()
 	mkdir -p $1/altroot/backup
 
 	cd $1
-	tar -czf altroot/backup/.etc.tgz etc
 	cp -p etc/config.xml altroot/backup
+	tar -czf altroot/backup/.etc.tgz etc
+
 	cd altroot
 	tar -czf backup/.var.tgz var
 }
@@ -235,16 +244,54 @@ mkhome()
 
 install_fsdir()
 {
-	echo "+++ Install ELWIX FS in bundle OS install file ..."
+	echo "+++ Install ELWIX FS $1 in bundle OS install file ..."
+	OSZ=""
 
-	install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel
+	install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel
 
-	install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
-	ln ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG}
-	ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG}
+	case "$2" in
+		_[Ll][Ii][Tt][Ee]_128)
+			install -d $1/usr
+			cd $1/usr
+			pax -r -z -pe -f ${REL}/${ROMFS_IMG}
+			cd -
 
-	cd $FS
-	tar -czvf ${REL}/${OS} .
+			install -d $1/usr/local
+			cd $1/usr/local
+			pax -r -z -pe -f ${REL}/${ROMFS_IMG2}
+			cd -
+
+			OSZ=${REL}/${OS_LITE128}
+			;;
+		_[Ll][Ii][Tt][Ee])
+			install -d $1/usr
+			cd $1/usr
+			pax -r -z -pe -f ${REL}/${ROMFS_IMG}
+			cd -
+
+			OSZ=${REL}/${OS_LITE}
+			;;
+		*)
+			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}
+
+			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}
+			;;
+	esac
+
+	cd $1
+	tar -czvf $OSZ .
 }
 
 ### main()
@@ -258,15 +305,34 @@ if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS
 fi
 
 clean_fsdir
-build_fsdir
 
+build_fsdir ${FS}
+build_fsdir ${FS_LITE}
+build_fsdir ${FS_LITE128}
+
 mkboot ${FS}
+mkboot ${FS_LITE}
+mkboot ${FS_LITE128}
+
 mkhome ${FS}
+mkhome ${FS_LITE}
+mkhome ${FS_LITE128}
+
 mkvar ${FS}
+mkvar ${FS_LITE}
+mkvar ${FS_LITE128}
+
 mketc ${FS}
+mketc ${FS_LITE} "_lite"
+mketc ${FS_LITE128} "_lite_128"
+
 mkbackup ${FS}
+mkbackup ${FS_LITE}
+mkbackup ${FS_LITE128}
 
-install_fsdir
+install_fsdir ${FS}
+install_fsdir ${FS_LITE} "_lite"
+install_fsdir ${FS_LITE128} "_lite_128"
 
 echo "+++ Complete build ELWIX FS"
 echo "ELWIX finish version ${VERSION}, Good luck!"