From: Géza Gémes <geza.gemes@gmail.com>
Date: Fri, 24 Mar 2017 18:59:35 +0000 (+0100)
Subject: Fix lopartsetup for util-linux >= 2.27.1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bb63c1077805f6de5d9377a1660bde82a79a827c;p=raisin.git

Fix lopartsetup for util-linux >= 2.27.1

fdisk from util-linux >= 2.27.1 returns units in a slightly different
structure than earlier versions

Signed-off-by: Géza Gémes <geza.gemes@gmail.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/scripts/lopartsetup b/scripts/lopartsetup
index 04ce3cc..da28b6e 100755
--- a/scripts/lopartsetup
+++ b/scripts/lopartsetup
@@ -53,7 +53,22 @@ then
     exit 1
 fi
 
-unit="`fdisk -lu $filename 2>/dev/null | grep -e "^Units = " | cut -d " " -f 9`"
+unitstring=""
+column=0
+if [ `fdisk -lu $filename 2>/dev/null | grep -e "^Units = " | wc -l` -eq 1 ]
+then
+    unitstring="^Units = "
+    column=9
+else if [ `fdisk -lu $filename 2>/dev/null | grep -e "^Units:" | wc -l` -eq 1 ]
+then
+    unitstring="^Units:"
+    column=8
+else
+    exit 1
+fi
+
+unit="`fdisk -lu $filename 2>/dev/null | grep -e "$unitstring" | cut -d " " -f $column`"
+
 index=0
 for i in "`fdisk -lu $filename 2>/dev/null | grep -e "^$filename"`"
 do