--- elwix/config/etc/default/rc.cfg	2017/10/08 23:01:55	1.3.2.20
+++ elwix/config/etc/default/rc.cfg	2017/10/09 23:48:00	1.3.2.22
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.20 2017/10/08 23:01:55 misho Exp $
+# $Id: rc.cfg,v 1.3.2.22 2017/10/09 23:48:00 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
@@ -24,15 +24,15 @@ 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); }'`
+		CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $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); }'`
+		CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'`
 
 		if [ ! -r ${CFG_NAND_LIST} ]; then
 			echo "# Auto generated manifest file" >${CFG_NAND_LIST}
@@ -47,15 +47,15 @@ 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); }'`
+		CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $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); }'`
+		CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'`
 
 		ELWIX_REMOTE_HOST=`cat /etc/myelwix`
 		ping -c1 $(echo ${ELWIX_REMOTE_HOST} | cut -f3 -d '/' | cut -f2 -d '@') >/dev/null 2>&1
@@ -71,8 +71,8 @@ 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); }'`
+		CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'`
+		CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'`
 
 		ELWIX_REMOTE_HOST="/tmp/${ELWIX_CFG_BACKUP_NAME}"
 
@@ -167,30 +167,10 @@ case "$1" in
 		fi
 		echo "ELWIX boot setup complete."
 		;;
-	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
-#!/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
-		cfexec -U
-		echo "ELWIX test setup activated."
-		echo "WARNING:: Next one load of ELWIX will be executing under test setup!"
-		;;
 	*)
 		echo "Missing parameter - available options are :"
 		echo "   load | save | erase | backup | restore | upgrade | "
-		echo "   pkg_load | pkg_save | pkg2cf | boot2 | boot | test_setup "
+		echo "   pkg_load | pkg_save | pkg2cf | boot2 | boot"
 		;;
 esac