--- elwix/config/etc/default/rc.cfg	2017/06/29 08:45:14	1.3.2.9
+++ elwix/config/etc/default/rc.cfg	2017/06/29 09:15:09	1.3.2.10
@@ -2,7 +2,7 @@
 #
 # 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.10 2017/06/29 09:15:09 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
@@ -102,7 +102,9 @@ case "$1" in
 	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:"
+			cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0f:"
+			cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+			rm -f /tmp/loader.conf.local.tmp
 		else
 			die "ERROR:: ELWIX has no second usable image!"
 		fi
@@ -110,7 +112,9 @@ 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:"
+		cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0a:"
+		cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local
+		rm -f /tmp/loader.conf.local.tmp
 		echo "ELWIX boot setup complete."
 		;;
 	*)