--- elwix/config/etc/default/rc.cfg	2017/06/29 08:45:14	1.3.2.9
+++ elwix/config/etc/default/rc.cfg	2017/07/13 08:49:31	1.3.2.13
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.9 2017/06/29 08:45:14 misho Exp $
+# $Id: rc.cfg,v 1.3.2.13 2017/07/13 08:49:31 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
@@ -89,20 +89,30 @@ case "$1" in
 			exit 1
 		fi
 		if [ ! -L /elwix/local -a ! -L /elwix/altroot/pkg/db ]; then
+			mount -uw /elwix/cf
 			mkdir -p ${PKG2CF}/db
 			mkdir -p ${PKG2CF}/local
-			cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db
-			cp -r /elwix/local/* ${PKG2CF}/local
+			cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db >/dev/null 2>&1
+			cp -r /elwix/local/* ${PKG2CF}/local >/dev/null 2>&1
 			rm -rf /elwix/local /elwix/altroot/pkg/db
-			ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
-			ln -s ${PKG2CF}/local /elwix/local
+			cfexec ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
+			if [ $? -eq 127 ]; then
+				ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
+			fi
+			cfexec ln -s ${PKG2CF}/local /elwix/local
+			if [ $? -eq 127 ]; then
+				ln -s ${PKG2CF}/local /elwix/local
+			fi
+			mount -ur /elwix/cf
 		fi
 		echo "ELWIX pkg2cf setup complete."
 		;;
 	boot2)
 		echo "ELWIX setup boot from second image"
 		if [ -c $ELWIX2 ]; then
-			cfexec cfger -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0f:"
+			cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -JSs currdev /boot/loader.conf.local "disk0f:"
+			cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+			rm -f /tmp/loader.conf.local.tmp
 		else
 			die "ERROR:: ELWIX has no second usable image!"
 		fi
@@ -110,7 +120,9 @@ case "$1" in
 		;;
 	boot)
 		echo "ELWIX setup boot from main image"
-		cfexec cfger -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0a:"
+		cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -JSs currdev /boot/loader.conf.local "disk0a:"
+		cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+		rm -f /tmp/loader.conf.local.tmp
 		echo "ELWIX boot setup complete."
 		;;
 	*)