--- elwix/config/etc/default/rc.cfg	2017/06/23 08:56:48	1.3.2.7
+++ elwix/config/etc/default/rc.cfg	2017/07/13 08:51:51	1.3.2.14
@@ -2,12 +2,14 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.7 2017/06/23 08:56:48 misho Exp $
+# $Id: rc.cfg,v 1.3.2.14 2017/07/13 08:51:51 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
 CFG_NAND_SIZE=524288
 
+ELWIX2="/dev/ufs/elwix2"
+
 UPGRADE_GPIO_PINS="1 2 3"
 
 ELWIX_CFG_BACKUP_NAME="elwix_cfg_$(hostname).bin"
@@ -73,6 +75,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)
@@ -87,18 +92,50 @@ case "$1" in
 			exit 1
 		fi
 		if [ ! -L /elwix/local -a ! -L /elwix/altroot/pkg/db ]; then
+			mount -uw /elwix/cf
 			mkdir -p ${PKG2CF}/db
 			mkdir -p ${PKG2CF}/local
-			cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db
-			cp -r /elwix/local/* ${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
-			ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
-			ln -s ${PKG2CF}/local /elwix/local
+			cfexec ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
+			if [ $? -eq 127 ]; then
+				ln -s ${PKG2CF}/db /elwix/altroot/pkg/db
+			fi
+			cfexec ln -s ${PKG2CF}/local /elwix/local
+			if [ $? -eq 127 ]; then
+				ln -s ${PKG2CF}/local /elwix/local
+			fi
+			mount -ur /elwix/cf
 		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
+			fi
+			rm -f /tmp/loader.conf.local.tmp
+		else
+			die "ERROR:: ELWIX has no second usable image!"
+		fi
+		echo "ELWIX boot2 setup complete."
+		;;
+	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
+		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)"
+		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf | boot2 | boot)"
 		;;
 esac