--- elwix/config/etc/uboot/rc.cfg	2014/02/04 14:21:51	1.1.2.12
+++ elwix/config/etc/uboot/rc.cfg	2018/01/01 22:34:33	1.3.2.3
@@ -2,65 +2,110 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.1.2.12 2014/02/04 14:21:51 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"
 CFG_NAND_SIZE=65536
 
-FRM_NAND_MAP="/dev/map/firmware"
-FRM_NAND_CNT=121
+UPGRADE_GPIO_PINS="8 6 7"
 
-UPGRADE_IMAGE=""
+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}
 
 case "$1" in
 	load)
-		dd if=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} 2>&- | \
-		      gunzip 2>&- | cpio -iud 2>&- || exit 1
+		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \
+		      gunzip 2>&- | cpio -iud 2>&- || die "ERROR:: config load"
 		;;
 	save)
-		if [ ! -r ${CFG_NAND_LIST} ];then
+		if [ ! -r ${CFG_NAND_LIST} ]; then
 			echo "# Auto generated manifest file" >${CFG_NAND_LIST}
 			find . >>${CFG_NAND_LIST}
 			if [ $? -ne 0 -o ! -r ${CFG_NAND_LIST} ]; then
-				echo "Manifest cfg nand map - file '${CFG_NAND_LIST}' not found!"
-				exit 1
+				die "ERROR:: Manifest cfg nand map - file '${CFG_NAND_LIST}' not found!"
 			fi
 		fi
 
 		sed -nE -e 's/^ *([^ #]+) */\1/p' < ${CFG_NAND_LIST} | xargs find | \
 			cpio -o | gzip -9 | \
-			dd of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 conv=sync \
-				2>&- || exit 1
+			imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || die "ERROR:: config save"
 		;;
 	erase)
-		dd if=/dev/zero of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 \
-			conv=sync 2>&- || exit 1
+		imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} /dev/zero || die "ERROR:: config erase"
                 echo "Config NAND was erased!"
 		;;
+	restore)
+		ELWIX_REMOTE_HOST=`cat /etc/myelwix`
+		ping -c1 $(echo ${ELWIX_REMOTE_HOST} | cut -f3 -d '/' | cut -f2 -d '@') >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			die "ERROR:: ELWIX restore from host ${ELWIX_REMOTE_HOST} failed!!!"
+		fi
+
+		echo "ELWIX starting restore process from ${ELWIX_REMOTE_HOST}"
+		fetch -q -o- --user-agent=ELWIX_Restore --allow-sslv2 \
+			--no-verify-peer --no-verify-hostname \
+			${ELWIX_REMOTE_HOST}/${ELWIX_CFG_BACKUP_NAME} | \
+			imgupd -R -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || die "ERROR:: config restore"
+		echo "ELWIX restore process complete. Now rebooting system ..."
+		;;
+	backup)
+		ELWIX_REMOTE_HOST="/tmp/${ELWIX_CFG_BACKUP_NAME}"
+
+		echo "ELWIX starting backup process to ${ELWIX_REMOTE_HOST}"
+		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} ${ELWIX_REMOTE_HOST} || die "ERROR:: config backup"
+		echo "ELWIX backup process complete."
+		;;
 	upgrade)
-		ELWIX_UPGRADE_HOST=`cat /etc/myelwix`
-		ping -c1 $(echo ${ELWIX_UPGRADE_HOST} | cut -f3 -d '/' | cut -f2 -d '@') >/dev/null 2>&1
+		echo "ELWIX switch to upgrade mode. Starting TFTPd ..."
+		echo " You can upload now elwix_firmware.bin image to device with \"firmware\" name!!!"
+		echo "  Example: put elwix_firmware.bin firmware"
+		for i in ${UPGRADE_GPIO_PINS}; do
+			gpioctl $i 1 >/dev/null 2>&1
+		done
+		TFTPd -wR
+		;;
+	pkg_save)
+		echo "ELWIX syncing information about installed packages into storage"
+		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 "ELWIX upgrade from host ${ELWIX_UPGRADE_HOST} failed!!!"
-			exit 1
+			echo "ERROR:: package save"
 		else
-			ELWIX_UPGRADE_HOST="${ELWIX_UPGRADE_HOST}/elwix/elwix_firmware.bin"
+			echo "ELWIX sync process complete."
 		fi
-
-		echo "ELIWX starting upgrade from ${ELWIX_UPGRADE_HOST}"
-		fetch -q -o- --user-agent=ELWIX_Upgrade --allow-sslv2 \
-			--no-verify-peer --no-verify-hostname ${ELWIX_UPGRADE_HOST} | \
-			dd of=${FRM_NAND_MAP} bs=${CFG_NAND_SIZE} \
-			count=${FRM_NAND_CNT} conv=sync 2>&- || exit 1
-		echo "ELWIX upgrade complete. Now rebooting system ..."
-		sleep 3
-		reboot
+		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 | upgrade)"
+		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf)"
 		;;
 esac