--- elwix/config/etc/default/fit2cf.sh	2011/07/05 23:43:00	1.1
+++ elwix/config/etc/default/fit2cf.sh	2021/03/11 13:59:50	1.2
@@ -3,7 +3,7 @@
 # (C)`10 by Michael Pounov <misho@elwix.org>
 #  ELWIX grow disklabel sectors and fit-to-flash whole unused space
 #
-# $Id: fit2cf.sh,v 1.1 2011/07/05 23:43:00 misho Exp $
+# $Id: fit2cf.sh,v 1.2 2021/03/11 13:59:50 misho Exp $
 #
 
 echo -n "++++ Check existence of fit2cf device ... "
@@ -31,22 +31,16 @@ else
 fi
 
 echo "Fit slice ${DEV}e to whole size of $DEV ..."
-DEVSIZE=`diskinfo $DEV | awk '{ printf("%s", $4); }'`
-disklabel $DEV 2>&- | awk -vdevsize=$DEVSIZE '($1 == "c:") {
+DEVSIZE=`diskinfo $DEV | awk '{ printf("%d", $4); }'`
+OLDSIZE=`disklabel $DEV | awk '($1 == "c:") { printf("%d", $2); }'`
+disklabel $DEV 2>&- | awk -vdevsize=$DEVSIZE -voldsize=$OLDSIZE '($1 == "c:") {
 			for (i = 1; i <= NF; i++)
 				printf("%s ", (i == 2) ? devsize : $i);
 			printf("\n");
 			next;
 		      }
 		      ($1 == "a:") {
-			for (i = 1; i <= NF; i++) {
-				if (i == 2)
-					offset = $i + $3
-				printf("%s ", $i);
-			}
-			printf("\n");
-			printf("e: %d %d unused 0 0 0\n", devsize - offset, offset);
-			next;
+			printf("e: %d %d unused 0 0 0\n", devsize - oldsize, oldsize);
 		      }
 		      { printf("%s\n", $0); }' >/tmp/disklabel.tmp
 
@@ -59,4 +53,4 @@ rm -f /tmp/disklabel.tmp
 echo
 echo " Now will restart system to activate new schema !!!"
 echo
-reboot
+kill -2 1