--- elwix/build_fs.sh	2011/07/21 13:05:09	1.1.2.1
+++ elwix/build_fs.sh	2011/07/21 13:46:05	1.1.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.1.2.1 2011/07/21 13:05:09 misho Exp $
+# $Id: build_fs.sh,v 1.1.2.2 2011/07/21 13:46:05 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -201,7 +201,7 @@ mketc()
 
 mkbackup()
 {
-	echo "+++ Build elwix fs backup factory default directory ..."
+	echo "+++ Build ELWIX FS backup factory default directory ..."
 	mkdir -p $1/altroot/backup
 
 	cd $1
@@ -209,7 +209,6 @@ mkbackup()
 	cp -p etc/config.xml altroot/backup
 	cd altroot
 	tar -czf backup/.var.tgz var
-	cd $TOPDIR
 }
 
 mkhome()
@@ -228,19 +227,15 @@ mkhome()
 
 install_fsdir()
 {
-	echo "+++ Install elwix fs in bundle OS install file ..."
+	echo "+++ Install ELWIX FS in bundle OS install file ..."
 
-	sed -nE -e 's/^ *([^ #]+) */\1/p' < $ELWIX_FS | tr ':' '\n' | 
-		tar -C / -cvf - -T - | tar -C $FS -x -f -
+	install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel
 
-	install -v $REL/$ROOTFS_KERN $FS/boot/kernel
+	install -v ${REL}/${ROMFS_IMG} ${FS}/elwix-firmware-${VERSION}_${TARGET_ARCH}
+	ln -s /elwix/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG}
 
-	install -v $REL/$FW_IMG $FS/elwix-firmware_$VERSION
-	ln -s /elwix/elwix-firmware_$VERSION $FS/$FW_IMG
-
 	cd $FS
-	tar -czvf $REL/$OS .
-	cd $TOPDIR
+	tar -czvf ${REL}/${OS} .
 }
 
 ### main()
@@ -260,9 +255,9 @@ mkboot ${FS}
 mkhome ${FS}
 mkvar ${FS}
 mketc ${FS}
-#mkbackup $FS
+mkbackup ${FS}
 
-#install_fsdir
+install_fsdir
 
 echo "+++ Complete build ELWIX FS"
 echo "ELWIX finish version ${VERSION}, Good luck!"