--- elwix/config/etc/default/rc.cfg	2017/10/11 21:41:56	1.3.2.23
+++ elwix/config/etc/default/rc.cfg	2021/03/11 13:59:50	1.4
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.23 2017/10/11 21:41:56 misho Exp $
+# $Id: rc.cfg,v 1.4 2021/03/11 13:59:50 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/ada0g"
@@ -91,6 +91,9 @@ case "$1" in
 		;;
 	pkg_save)
 		echo "ELWIX syncing information about installed packages into storage"
+		if mount | grep "${CFDIR}" >/dev/null 2>&1; then
+			mount -uw ${CFDIR}
+		fi
 		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
@@ -98,6 +101,9 @@ case "$1" in
 		else
 			echo "ELWIX sync process complete."
 		fi
+		if mount | grep "${CFDIR}" >/dev/null 2>&1; then
+			mount -ur ${CFDIR}
+		fi
 		cfexec -U
 		;;
 	pkg_load)
@@ -134,12 +140,35 @@ case "$1" in
 		echo "ELWIX pkg2cf setup complete."
 		;;
 	boot2)
-		echo "ELWIX setup boot from second image"
+		echo "ELWIX setup system boot from second image"
 		if [ -c $ELWIX2 ]; then
 			if mount | grep "${ELWIX2} " >/dev/null 2>&1; then
 				die "You already booted from backup image! Skip changing image ..."
 			fi
 
+			IMGTYPE=$(cat ./platform | awk '{ printf("%s", $2); }')
+			case $IMGTYPE in
+				base)
+					if ! mount $ELWIX2 /mnt; then
+						die "Backup image seems like broken ..."
+					fi
+
+					awk -v elwix="$ELWIX" -v elwix2="$ELWIX2" '
+						($1 == elwix) { gsub("\/", "\/", elwix); sub(elwix, elwix2, $0); }
+						{ print $0; }
+					' /mnt/etc/fstab > /tmp/fstab.tmp
+					if [ $? -eq 0 ]; then
+						cp /tmp/fstab.tmp /mnt/etc/fstab
+						rm -f /tmp/fstab.tmp
+					fi
+
+					umount /mnt
+					echo "ELWIX prepare backup image for next boot!"
+					;;
+				*)
+					;;
+			esac
+
 			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"
@@ -152,7 +181,7 @@ case "$1" in
 		echo "ELWIX boot2 setup complete."
 		;;
 	boot)
-		echo "ELWIX setup boot from main image"
+		echo "ELWIX setup system boot from main image"
 		if mount | grep "${ELWIX2} " >/dev/null 2>&1; then
 			mount ${ELWIX} /mnt