--- elwix/config/etc/uboot/rc.cfg	2017/06/23 08:56:48	1.3.2.2
+++ elwix/config/etc/uboot/rc.cfg	2021/09/13 00:41:37	1.4.4.1
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.2 2017/06/23 08:56:48 misho Exp $
+# $Id: rc.cfg,v 1.4.4.1 2021/09/13 00:41:37 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/map/cfg"
@@ -12,7 +12,8 @@ UPGRADE_GPIO_PINS="8 6 7"
 
 ELWIX_CFG_BACKUP_NAME="elwix_cfg_$(hostname).bin"
 
-PKG2CF="/elwix/cf/pkg"
+CFDIR="/elwix/cf"
+PKG2CF="${CFDIR}/pkg"
 
 die() { echo -n "EXIT: " >&2; echo "$@" >&2; exit 1; }
 
@@ -21,7 +22,7 @@ cd ${2:-/etc}
 case "$1" in
 	load)
 		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \
-		      gunzip 2>&- | cpio -iud 2>&- || die "ERROR:: config load"
+		      gunzip 2>&- | cpio -iud --insecure 2>&- || die "ERROR:: config load"
 		;;
 	save)
 		if [ ! -r ${CFG_NAND_LIST} ]; then
@@ -72,8 +73,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"
-		echo "ELWIX sync process complete."
+		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
+		cfexec -U
 		;;
 	pkg_load)
 		echo "ELWIX loading information about installed packages from storage"
@@ -82,7 +89,7 @@ case "$1" in
 		;;
 	pkg2cf)
 		echo "ELWIX setup new pkg location on CF at $PKGCF"
-		if ! mount | grep "/elwix/cf"; then
+		if ! mount | grep "${CFDIR}" >/dev/null 2>&1; then
 			echo "Skip pkg2cf setup, because CF partition isn't mounted ..."
 			exit 1
 		fi