--- elwix/config/etc/default/rc.cfg	2017/06/28 11:59:10	1.3.2.8
+++ elwix/config/etc/default/rc.cfg	2017/06/29 08:45:14	1.3.2.9
@@ -2,12 +2,14 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.8 2017/06/28 11:59:10 misho Exp $
+# $Id: rc.cfg,v 1.3.2.9 2017/06/29 08:45:14 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"
@@ -97,15 +99,22 @@ case "$1" in
 		fi
 		echo "ELWIX pkg2cf setup complete."
 		;;
-	boot2nd)
+	boot2)
 		echo "ELWIX setup boot from second image"
-		if []; then
-			tunefs -L '' 
+		if [ -c $ELWIX2 ]; then
+			cfexec cfger -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0f:"
+		else
+			die "ERROR:: ELWIX has no second usable image!"
 		fi
-		echo "ELWIX boot2nd setup complete."
+		echo "ELWIX boot2 setup complete."
 		;;
+	boot)
+		echo "ELWIX setup boot from main image"
+		cfexec cfger -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0a:"
+		echo "ELWIX boot setup complete."
+		;;
 	*)
-		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf | boot2nd)"
+		echo "Missing parameter - available options are (load | save | erase | backup | restore | upgrade | pkg_load | pkg_save | pkg2cf | boot2 | boot)"
 		;;
 esac