--- elwix/config/etc/default/rc.cfg	2017/07/13 08:39:21	1.3.2.12
+++ elwix/config/etc/default/rc.cfg	2017/07/13 08:51:51	1.3.2.14
@@ -2,7 +2,7 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.3.2.12 2017/07/13 08:39:21 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"
@@ -75,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)
@@ -89,13 +92,21 @@ 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 >/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."
 		;;
@@ -104,6 +115,9 @@ case "$1" in
 		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!"
@@ -114,6 +128,9 @@ case "$1" in
 		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."
 		;;