--- elwix/config/etc/default/rc.cfg	2017/06/29 08:45:14	1.3.2.9
+++ elwix/config/etc/default/rc.cfg	2017/10/08 20:31:11	1.3.2.19
@@ -2,19 +2,21 @@
 #
 # 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.19 2017/10/08 20:31:11 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
 CFG_NAND_SIZE=524288
 
 ELWIX2="/dev/ufs/elwix2"
+ELWIX="/dev/ufs/elwix"
 
 UPGRADE_GPIO_PINS="1 2 3"
 
 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; }
 
@@ -22,10 +24,16 @@ cd ${2:-/etc}
 
 case "$1" in
 	load)
+		CFG_NAND_MAP=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $2 * 512); }'`
+
 		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \
 		      gunzip 2>&- | cpio -iud 2>&- || die "ERROR:: config load"
 		;;
 	save)
+		CFG_NAND_MAP=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $2 * 512); }'`
+
 		if [ ! -r ${CFG_NAND_LIST} ]; then
 			echo "# Auto generated manifest file" >${CFG_NAND_LIST}
 			find . >>${CFG_NAND_LIST}
@@ -39,10 +47,16 @@ case "$1" in
 			imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || die "ERROR:: config save"
 		;;
 	erase)
+		CFG_NAND_MAP=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $2 * 512); }'`
+
 		imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} /dev/zero || die "ERROR:: config erase"
                 echo "Config NAND was erased!"
 		;;
 	restore)
+		CFG_NAND_MAP=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $2 * 512); }'`
+
 		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
@@ -57,6 +71,9 @@ case "$1" in
 		echo "ELWIX restore process complete. Now rebooting system ..."
 		;;
 	backup)
+		CFG_NAND_MAP=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '($3 ~ "d[0-9]g" && $4 == "\!0") { printf("%s\n", $2 * 512); }'`
+
 		ELWIX_REMOTE_HOST="/tmp/${ELWIX_CFG_BACKUP_NAME}"
 
 		echo "ELWIX starting backup process to ${ELWIX_REMOTE_HOST}"
@@ -75,6 +92,9 @@ 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"
+		fi
 		echo "ELWIX sync process complete."
 		;;
 	pkg_load)
@@ -84,25 +104,56 @@ 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
 		if [ ! -L /elwix/local -a ! -L /elwix/altroot/pkg/db ]; then
+			mount -uw ${CFDIR}
 			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
+
+			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
+			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
+			fi
+
+			mount -ur ${CFDIR}
 		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:"
+			if mount | grep "${ELWIX2} " >/dev/null 2>&1; then
+				die "You already booted from backup image! Skip changing image ..."
+			fi
+
+			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
+			rm -f /tmp/loader.conf.local.tmp
 		else
 			die "ERROR:: ELWIX has no second usable image!"
 		fi
@@ -110,11 +161,42 @@ 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:"
+		if mount | grep "${ELWIX2} " >/dev/null 2>&1; then
+			mount ${ELWIX} /mnt
+
+			cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" \
+				-JSs currdev /mnt/boot/loader.conf.local "\"disk0a:\""
+			cp /tmp/loader.conf.local.tmp /mnt/boot/loader.conf.local
+			rm -f /tmp/loader.conf.local.tmp
+
+			umount /mnt
+		else
+			die "You already booted from main image! Skip changing image ..."
+		fi
 		echo "ELWIX boot setup complete."
 		;;
+	test_setup)
+		echo "ELWIX test setup boot sequence"
+		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
+#!/bin/sh
+#
+# Test setup boot sequence timer script
+# This script is auto generated from rc.cfg.
+
+# 5min to reboot & restore old state of boot
+sleep 300
+reboot
+__EOF
+		chmod +x /etc/rc.t/999.test_setup.run
+		echo "ELWIX test setup activated."
+		echo "WARNING:: Next one load of ELWIX will be executing under test setup!"
+		;;
 	*)
-		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf | boot2 | boot)"
+		echo "Missing parameter - available options are :"
+		echo "   load | save | erase | backup | restore | upgrade | "
+		echo "   pkg_load | pkg_save | pkg2cf | boot2 | boot | test_setup "
 		;;
 esac