--- elwix/build_fs.sh	2012/05/29 14:24:05	1.3.2.7
+++ elwix/build_fs.sh	2012/10/10 14:13:16	1.3.2.11
@@ -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.7 2012/05/29 14:24:05 misho Exp $
+# $Id: build_fs.sh,v 1.3.2.11 2012/10/10 14:13:16 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -60,11 +60,11 @@ build_fsdir()
 	install -d altroot/var/db;
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
-	install -d -o 80 -g 80 altroot/var/log/lighttpd;
+#	install -d -o 80 -g 80 altroot/var/log/lighttpd;
 	install -d -o 101 -g 101 altroot/var/log/quagga;
 	install -d altroot/var/named;
 	install -d altroot/var/run;
-	install -d -o 80 -g 80 altroot/var/run/lighttpd;
+#	install -d -o 80 -g 80 altroot/var/run/lighttpd;
 	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;
@@ -161,8 +161,8 @@ create_etc_fstab()
 # Automatic generated fstab for ELWIX 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
+md4			/tmp	mfs	rw,-s8m,-oasync,-S	0       0
+md5			/var	mfs	rw,-s16m,-S		0       0
 _EOF
 }
 
@@ -241,9 +241,20 @@ install_fsdir()
 
 	install -v ${REL}/${ROOTFS_KERN} ${FS}/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}
+	if [ "${BUILD_FRMIMG}" = "YES" ]; then
+		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}
+
+		install -v ${REL}/${ROMFS_IMG2} ${FS}/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH}
+		ln ${FS}/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG2}
+		ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG2}
+	else
+		install -d ${FS}/usr
+		cd ${FS}/usr
+		pax -r -z -pe -f ${REL}/${ROMFS_IMG}
+		cd -
+	fi
 
 	cd $FS
 	tar -czvf ${REL}/${OS} .