--- elwix/build_rootfs.sh	2012/10/09 15:23:56	1.2.4.14
+++ elwix/build_rootfs.sh	2013/10/14 12:43:44	1.7.4.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.2.4.14 2012/10/09 15:23:56 misho Exp $
+# $Id: build_rootfs.sh,v 1.7.4.1 2013/10/14 12:43:44 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -30,7 +30,10 @@ if [ "${USER}" != "root" ]; then
 	exit 1
 fi
 
-NEWKERN="${REL}/kernel"
+KRNNAME="kernel_rootfs"
+NEWKERN="${REL}/${KRNNAME}"
+MKF="Makefile.elwix"
+MKH="Makefile.inc"
 
 clean_elwix()
 {
@@ -38,8 +41,8 @@ clean_elwix()
 	rm -rf $BSDOBJ/elwix
 
 	echo "+++ Clean ELWIX RootFS firmware ..."
-	rm -rf $MKDIR
-	mkdir $MKDIR
+	rm -rf $ROOTFS_MKDIR
+	mkdir $ROOTFS_MKDIR
 
 	echo "+++ Clean RootFS directory ..."
 	chflags -R noschg $ROOTFS
@@ -53,7 +56,7 @@ clean_elwix()
 prepare_elwix()
 {
 	echo "+++ Prepair ELWIX RootFS firmware ..."
-	cd $MKDIR
+	cd $ROOTFS_MKDIR
 	cat >$MKH <<_EOF
 # Auto-generated Makefile include for crungegen
 # !!! Dont edit by hand !!!
@@ -75,18 +78,20 @@ _EOF
 
 	. ${CENV}
 	install -d ${BSDOBJ}/elwix
-	crunchgen -f -o -p ${BSDOBJ}/elwix -h $MKDIR/$MKH -m $MKF -c elwix.c -e elwix $ROOTFS_CONF
+	crunchgen -f -o -p ${BSDOBJ}/elwix -h $ROOTFS_MKDIR/$MKH -m $MKF \
+		-c elwix.c -e elwix $ROOTFS_CONF
 	cd -
 }
 
 build_elwix()
 {
 	echo "+++ Build ELWIX RootFS firmware ..."
-	cd $MKDIR
+	cd $ROOTFS_MKDIR
 	. ${CENV}
-	MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
-	make -f $MKF clean
-	make -f $MKF
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+		MAKEOBJDIRPREFIX=${BSDOBJ}/elwix clean
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+		MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
 	if [ $? -ne 0 ]; then
 		exit 1
 	fi
@@ -106,7 +111,6 @@ build_rootdir()
 	install -d mnt;
 	install -d -m 0555 proc;
 	install -d sbin;
-	install -d system;
 	install -d -m 1777 tmp;
 	install -d usr;
 	install -d usr/bin;
@@ -114,6 +118,7 @@ build_rootdir()
 	install -d usr/libexec;
 	install -d usr/sbin;
 	install -d var;
+	install -d var/sys;
 
 	ln -fs /usr/lib lib;
 
@@ -138,7 +143,7 @@ install_rootfs()
 	LNPRG="${SBIN}/elwix"
 
 	echo "+++ Install ELWIX into RootFS directory ..."
-	install $MKDIR/elwix $SBIN
+	install $ROOTFS_MKDIR/elwix $SBIN
 
 	InstallList ${ELWIX_ROOTFS} ${WORLD} ${ROOTFS}
 
@@ -280,7 +285,7 @@ install_rootfs()
 	ln -s $PRG $SBIN/mount_cd9660
 	ln -s $PRG $SBIN/mount_msdosfs
 	ln -s $PRG $SBIN/mount_nfs
-	ln -s $PRG $SBIN/mount_ntfs
+#	ln -s $PRG $SBIN/mount_ntfs
 	ln -s $PRG $SBIN/mount_nullfs
 	ln -s $PRG $SBIN/mount_udf
 	ln -s $PRG $SBIN/mount_unionfs
@@ -373,23 +378,23 @@ build_image()
 install_image()
 {
 	echo "+++ Install ELWIX RootFS Image into kernel ..."
-	START=`strings -td $KERNEL | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`
-	STOP=`strings -td $KERNEL | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`
+	START=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`
+	STOP=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`
 	STOP=$(($STOP + 1))
 
-	head -c $START $KERNEL >$NEWKERN
+	head -c $START $KERNEL_ROOTFS >$NEWKERN
 	cat $REL/$ROOTFS_IMG >>$NEWKERN
-	tail -c +$STOP $KERNEL >>$NEWKERN
+	tail -c +$STOP $KERNEL_ROOTFS >>$NEWKERN
 
 	cd $REL
-	gzip -9 kernel
+	gzip -9 $KRNNAME
 	cd -
 }
 
 ### main()
 if SnitVer ${WORLD}/elwix.ver; then
-	clean_elwix
-	prepare_elwix
+#	clean_elwix
+#	prepare_elwix
 	build_elwix
 
 	build_rootdir