--- elwix/config/etc/default/rc.cfg	2017/07/13 09:46:29	1.3.2.15
+++ elwix/config/etc/default/rc.cfg	2017/10/09 22:12:45	1.3.2.21
@@ -2,19 +2,21 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.15 2017/07/13 09:46:29 misho Exp $
+# $Id: rc.cfg,v 1.3.2.21 2017/10/09 22:12:45 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; }
 
@@ -89,11 +91,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"
-		if [ $? -eq 127 ]; then
-			tar -czvf /elwix/altroot/pkg/db/pkgz.tar.gz /var/db/pkg/* || die "ERROR:: package save"
+		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
-		echo "ELWIX sync process complete."
+		cfexec -U
 		;;
 	pkg_load)
 		echo "ELWIX loading information about installed packages from storage"
@@ -102,37 +107,44 @@ 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 /elwix/cf
+			mount -uw ${CFDIR}
 			mkdir -p ${PKG2CF}/db
 			mkdir -p ${PKG2CF}/local
-			cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db >/dev/null 2>&1
-			cp -r /elwix/local/* ${PKG2CF}/local >/dev/null 2>&1
-			rm -rf /elwix/local /elwix/altroot/pkg/db
-			cfexec ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
-			if [ $? -eq 127 ]; then
+
+			cfexec -L "Locked by rc.cfg for pkg2cf"
+			if [ ! -L /elwix/altroot/pkg/db ]; then 
+				cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db >/dev/null 2>&1
+				rm -rf /elwix/altroot/pkg/db
 				ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
 			fi
-			cfexec ln -s ${PKG2CF}/local /elwix/local
-			if [ $? -eq 127 ]; then
+			if [ ! -L /elwix/local ]; then
+				cp -r /elwix/local/* ${PKG2CF}/local >/dev/null 2>&1
+				rm -rf /elwix/local
 				ln -s ${PKG2CF}/local /elwix/local
 			fi
-			mount -ur /elwix/cf
+			cfexec -U
+
+			mount -ur ${CFDIR}
 		fi
 		echo "ELWIX pkg2cf setup complete."
 		;;
 	boot2)
 		echo "ELWIX setup boot from second image"
 		if [ -c $ELWIX2 ]; then
-			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
+			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 -L "Locked by rc.cfg for boot2"
+			cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+			cfexec -U
 			rm -f /tmp/loader.conf.local.tmp
 		else
 			die "ERROR:: ELWIX has no second usable image!"
@@ -141,16 +153,24 @@ case "$1" in
 		;;
 	boot)
 		echo "ELWIX setup boot from main image"
-		cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -JSs currdev /boot/loader.conf.local "disk0a:"
-		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
+		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
-		rm -f /tmp/loader.conf.local.tmp
 		echo "ELWIX boot setup complete."
 		;;
 	*)
-		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"
 		;;
 esac