--- elwix/config/etc/default/rc.init	2017/06/19 13:14:03	1.6.2.3
+++ elwix/config/etc/default/rc.init	2017/10/08 09:54:58	1.6.2.5
@@ -2,7 +2,7 @@
 #
 # Boot startup script for elwix :)
 #
-# $Id: rc.init,v 1.6.2.3 2017/06/19 13:14:03 misho Exp $
+# $Id: rc.init,v 1.6.2.5 2017/10/08 09:54:58 misho Exp $
 
 stty status '^T'
 
@@ -18,6 +18,7 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
+CFDIR="/elwix/cf"
 SYSPKGDIR="/var/frm"
 BOOTLOG="/var/run/elwix.boot"
 
@@ -30,10 +31,10 @@ umask 022
 boot()
 {
 	echo "Loading ELWIX configz ..."
+
 	cd /elwix/altroot
 	pax -rw -pe var /
 	chmod 1777 /var/tmp
-#	mount -tunionfs -onoatime /var/db/etc /elwix/etc
 	mount -ttmpfs tmpfs /var/db/pkg
 	cd /
 }
@@ -41,7 +42,7 @@ boot()
 restore_uboot()
 {
 	echo "Restore configz from NAND ..."
-	cfexec /etc/rc.cfg load /etc
+	/etc/rc.cfg load /etc
 }
 
 options()
@@ -53,7 +54,7 @@ options()
 passwd()
 {
 	echo "Syncing password database ..." | tee -a $BOOTLOG
-	cfexec pwd_mkdb /etc/master.passwd | tee -a $BOOTLOG 1>/dev/null 2>&1
+	pwd_mkdb /etc/master.passwd | tee -a $BOOTLOG 1>/dev/null 2>&1
 	rm -f /etc/nologin
 }
 
@@ -97,7 +98,7 @@ syspkg()
 
 	echo "Mounting firmware system packages:" | tee -a $BOOTLOG
 # Raw images
-	for i in /elwix/cf/*-pkg.frm; do
+	for i in ${CFDIR}/*-pkg.frm; do
 		if [ -r $i ]; then
 			MDDEV=$(mdconfig -a -t vnode -f $i);
 			install -d $SYSPKGDIR/$MDDEV;
@@ -119,7 +120,7 @@ syspkg()
 		fi
 	done
 # UZIP images
-	for i in /elwix/cf/*-pkg.frz; do
+	for i in ${CFDIR}/*-pkg.frz; do
 		if [ -r $i ]; then
 			MDDEV=$(mdconfig -a -t vnode -f $i);
 			install -d $SYSPKGDIR/$MDDEV;