--- elwix/install2img.sh	2013/07/29 21:04:03	1.6.2.1
+++ elwix/install2img.sh	2017/06/28 11:59:10	1.8.4.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: install2img.sh,v 1.6.2.1 2013/07/29 21:04:03 misho Exp $
+# $Id: install2img.sh,v 1.8.4.4 2017/06/28 11:59:10 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -52,6 +52,41 @@ initdev()
 		exit 3
 	fi
 
+	if [ X"$2" != X"no" ]; then
+		disklabel $1 2>&- | awk -vcfgsize=${CFG_NAND_SIZE:-65536} '($1 == "a:") {
+					cfgsize /= 512;
+					bootoff = $3;
+					freesize = $2 - cfgsize;
+					imgsize = freesize / 2;
+
+					printf("  a: %d %d unused 0 0 0\n", imgsize, cfgsize + bootoff);
+					printf("  f: %d %d unused 0 0 0\n", imgsize, imgsize + cfgsize + bootoff);
+					printf("  g: %d %d cfg 0 0 0\n", cfgsize, bootoff);
+					next;
+				}
+				{ printf("%s\n", $0); }' >/tmp/disklabel.tmp
+	else
+		disklabel $1 2>&- | awk -vcfgsize=${CFG_NAND_SIZE:-65536} '($1 == "a:") {
+					cfgsize /= 512;
+					bootoff = $3;
+					freesize = $2 - cfgsize;
+					imgsize = freesize;
+
+					printf("  a: %d %d unused 0 0 0\n", imgsize, cfgsize + bootoff);
+					printf("  g: %d %d cfg 0 0 0\n", cfgsize, bootoff);
+					next;
+				}
+				{ printf("%s\n", $0); }' >/tmp/disklabel.tmp
+	fi
+
+	if disklabel -R -m ${TARGET} $1 /tmp/disklabel.tmp; then
+		rm -f /tmp/disklabel.tmp
+		echo "OK"
+	else
+		echo "Failed!"
+		exit 3
+	fi
+
 	if newfs -b8192 -f1024 -m0 -Lelwix ${1}a; then
 		echo "+++ Formatting ... OK"
 	else
@@ -114,6 +149,38 @@ install2()
 	fi
 }
 
+mkbak2()
+{
+	if [ X"$2" != X"no" ]; then
+		echo -n "+++ Syncing ELWIX OS image as backup OS image into ${1}f ..."
+		if dd if=/dev/${1}a of=/dev/${1}f; then
+			tunefs -L elwix2 /dev/${1}f
+			echo "OK"
+		else
+			echo "Failed!"
+			exit 8
+		fi
+	else
+		echo "+++ Make ELWIX OS system image partion for upgrade into ${REL}/sys4up_${IMGNAME}.bin ..."
+		if dd if=/dev/${1}a of=${REL}/sys4up_${IMGNAME}.bin; then
+			echo "OK"
+		else
+			echo "Failed!"
+			exit 9
+		fi
+	fi
+
+	if [ ! -f ${REL}/sys4up_${IMGNAME}.bin ]; then
+		echo "+++ Make ELWIX OS system image partion for upgrade into ${REL}/sys4up_${IMGNAME}.bin ..."
+		if dd if=/dev/${1}a of=${REL}/sys4up_${IMGNAME}.bin; then
+			echo "OK"
+		else
+			echo "Failed!"
+			exit 9
+		fi
+	fi
+}
+
 cleandev()
 {
 	mdconfig -d -u $1
@@ -129,21 +196,29 @@ gencksum()
 
 ### main()
 
-if [ ! -r ${REL}/${OS} ]; then
+if [ -z "$1" -o ! -r "$1" ]; then
 	echo
-	echo "Error:: ELWIX OS file not found!"
+	echo "Error:: ELWIX OS tar file '$1' not found!"
+	echo "Syntax:: ./install2img.sh <ELWIX.tar.gz> [CF size] [yes == make secondary backup image]"
 	echo
 	exit 2
+else
+	IMGNAME=$(basename $1 | sed -e "s/.tar.gz//")
+	MD5CHK="${REL}/${IMGNAME}${3:+"_2nd"}.md5"
+	SHA1CHK="${REL}/${IMGNAME}${3:+"_2nd"}.sha1"
+	IMG="${REL}/${IMGNAME}${3:+"_2nd"}.img"
 fi
 
-mkdevice $IMG ${1:-"${IMG_SIZE}"}
-initdev $DEV
+mkdevice $IMG ${2:-"${IMG_SIZE}"}
+initdev $DEV ${3:-"no"}
 mountdev $DEV
-install2 ${REL}/${OS}
+install2 $1
 umountdev
 #enablejfs $DEV
 boot2dev $DEV
+mkbak2 $DEV ${3:-"no"}
 cleandev $DEV
 gencksum $IMG $MD5CHK $SHA1CHK
+gencksum ${REL}/sys4up_${IMGNAME}.bin ${REL}/sys4up_${IMGNAME}.md5 ${REL}/sys4up_${IMGNAME}.sha1
 
-echo "ELWIX OS image complete."
+echo "ELWIX OS image ${IMGNAME}${3:+"_2nd"} complete."