--- elwix/config/etc/default/rc.cfg	2017/10/08 20:31:11	1.3.2.19
+++ elwix/config/etc/default/rc.cfg	2017/10/08 23:01:55	1.3.2.20
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.19 2017/10/08 20:31:11 misho Exp $
+# $Id: rc.cfg,v 1.3.2.20 2017/10/08 23:01:55 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
@@ -91,11 +91,14 @@ case "$1" in
 		;;
 	pkg_save)
 		echo "ELWIX syncing information about installed packages into storage"
-		cfexec tar -czvf /elwix/altroot/pkg/db/pkgz.tar.gz /var/db/pkg/* || die "ERROR:: package save"
-		if [ $? -eq 127 ]; then
-			tar -czvf /elwix/altroot/pkg/db/pkgz.tar.gz /var/db/pkg/* || die "ERROR:: package save"
+		cfexec -L "Locked by rc.cfg for pkg_save"
+		tar -czvf /elwix/altroot/pkg/db/pkgz.tar.gz /var/db/pkg/*
+		if [ $? -ne 0 ]; then
+			echo "ERROR:: package save"
+		else
+			echo "ELWIX sync process complete."
 		fi
-		echo "ELWIX sync process complete."
+		cfexec -U
 		;;
 	pkg_load)
 		echo "ELWIX loading information about installed packages from storage"
@@ -113,28 +116,18 @@ case "$1" in
 			mkdir -p ${PKG2CF}/db
 			mkdir -p ${PKG2CF}/local
 
+			cfexec -L "Locked by rc.cfg for pkg2cf"
 			if [ ! -L /elwix/altroot/pkg/db ]; then 
 				cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db >/dev/null 2>&1
-				cfexec rm -rf /elwix/altroot/pkg/db
-				if [ $? -eq 127 ]; then
-					rm -rf /elwix/altroot/pkg/db
-				fi
-				cfexec ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
-				if [ $? -eq 127 ]; then
-					ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
-				fi
+				rm -rf /elwix/altroot/pkg/db
+				ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
 			fi
 			if [ ! -L /elwix/local ]; then
 				cp -r /elwix/local/* ${PKG2CF}/local >/dev/null 2>&1
-				cfexec rm -rf /elwix/local
-				if [ $? -eq 127 ]; then
-					rm -rf /elwix/local
-				fi
-				cfexec ln -s ${PKG2CF}/local /elwix/local
-				if [ $? -eq 127 ]; then
-					ln -s ${PKG2CF}/local /elwix/local
-				fi
+				rm -rf /elwix/local
+				ln -s ${PKG2CF}/local /elwix/local
 			fi
+			cfexec -U
 
 			mount -ur ${CFDIR}
 		fi
@@ -149,10 +142,9 @@ case "$1" in
 
 			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
-			if [ $? -eq 127 ]; then
-				cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
-			fi
+			cfexec -L "Locked by rc.cfg for boot2"
+			cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+			cfexec -U
 			rm -f /tmp/loader.conf.local.tmp
 		else
 			die "ERROR:: ELWIX has no second usable image!"
@@ -177,6 +169,7 @@ case "$1" in
 		;;
 	test_setup)
 		echo "ELWIX test setup boot sequence"
+		cfexec -L "Locked by rc.cfg for test_setup"
 		ln -sf /etc/rc.t /etc/rc.S
 		cp /etc/rc.s/*.run /etc/rc.t
 		cat >/etc/rc.t/999.test_setup.run <<__EOF
@@ -190,6 +183,7 @@ sleep 300
 reboot
 __EOF
 		chmod +x /etc/rc.t/999.test_setup.run
+		cfexec -U
 		echo "ELWIX test setup activated."
 		echo "WARNING:: Next one load of ELWIX will be executing under test setup!"
 		;;