--- elwix/config/etc/uboot/rc.cfg	2017/06/20 08:42:55	1.3.2.1
+++ elwix/config/etc/uboot/rc.cfg	2018/01/01 22:34:33	1.3.2.3
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.1 2017/06/20 08:42:55 misho Exp $
+# $Id: rc.cfg,v 1.3.2.3 2018/01/01 22:34:33 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/map/cfg"
@@ -12,6 +12,9 @@ UPGRADE_GPIO_PINS="8 6 7"
 
 ELWIX_CFG_BACKUP_NAME="elwix_cfg_$(hostname).bin"
 
+CFDIR="/elwix/cf"
+PKG2CF="${CFDIR}/pkg"
+
 die() { echo -n "EXIT: " >&2; echo "$@" >&2; exit 1; }
 
 cd ${2:-/etc}
@@ -70,16 +73,39 @@ 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"
 		tar -xzvpf /elwix/altroot/pkg/db/pkgz.tar.gz -C / || die "ERROR:: package load"
 		echo "ELWIX load process complete."
 		;;
+	pkg2cf)
+		echo "ELWIX setup new pkg location on CF at $PKGCF"
+		if ! mount | grep "${CFDIR}" >/dev/null 2>&1; then
+			echo "Skip pkg2cf setup, because CF partition isn't mounted ..."
+			exit 1
+		fi
+		if [ ! -L /elwix/local -a ! -L /elwix/altroot/pkg/db ]; then
+			mkdir -p ${PKG2CF}/db
+			mkdir -p ${PKG2CF}/local
+			cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db
+			cp -r /elwix/local/* ${PKG2CF}/local
+			rm -rf /elwix/local /elwix/altroot/pkg/db
+			ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
+			ln -s ${PKG2CF}/local /elwix/local
+		fi
+		echo "ELWIX pkg2cf setup complete."
+		;;
 	*)
-		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save)"
+		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf)"
 		;;
 esac