summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjpaetzel <jpaetzel@FreeBSD.org>2011-01-08 20:25:00 +0000
committerjpaetzel <jpaetzel@FreeBSD.org>2011-01-08 20:25:00 +0000
commit0ed3bd02d8dc1c65a161d1e4c6047fdd53e2e08f (patch)
tree3eeb69263f93fdc66066692d215e8fccd03cbc66 /usr.sbin
parent33ad050e0eedf7276932202e25c9e7581c5d529b (diff)
downloadFreeBSD-src-0ed3bd02d8dc1c65a161d1e4c6047fdd53e2e08f.zip
FreeBSD-src-0ed3bd02d8dc1c65a161d1e4c6047fdd53e2e08f.tar.gz
More elegant way to detect MBR vs. GPT
Submitted by: nwhitehorn Approved by: imp
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/pc-sysinstall/backend-query/disk-part.sh10
-rwxr-xr-xusr.sbin/pc-sysinstall/backend/functions-disk.sh7
2 files changed, 3 insertions, 14 deletions
diff --git a/usr.sbin/pc-sysinstall/backend-query/disk-part.sh b/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
index 900cbca..e5e7355 100755
--- a/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
+++ b/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
@@ -60,14 +60,8 @@ if [ "$?" != "0" ] ; then
fi
# Display if this is GPT or MBR formatted
-gpart show ${1} | grep "GPT" >/dev/null 2>/dev/null
-if [ "$?" = "0" ] ; then
- echo "${1}-format: GPT"
- TYPE="GPT"
-else
- echo "${1}-format: MBR"
- TYPE="MBR"
-fi
+TYPE=`gpart show ${1} | awk '/^=>/ { printf("%s",$5); }'`
+echo "${1}-format: $TYPE"
# Set some search flags
PART="0"
diff --git a/usr.sbin/pc-sysinstall/backend/functions-disk.sh b/usr.sbin/pc-sysinstall/backend/functions-disk.sh
index 0b14591..6ef1c84 100755
--- a/usr.sbin/pc-sysinstall/backend/functions-disk.sh
+++ b/usr.sbin/pc-sysinstall/backend/functions-disk.sh
@@ -180,12 +180,7 @@ get_disk_partitions()
return
fi
- gpart show ${1} | grep "MBR" >/dev/null 2>/dev/null
- if [ "$?" = "0" ] ; then
- type="MBR"
- else
- type="GPT"
- fi
+ type=`gpart show ${1} | awk '/^=>/ { printf("%s",$5); }'`
SLICES="`gpart show ${1} | grep -v ${1} | grep -v ' free ' |tr -s '\t' ' ' | cut -d ' ' -f 4 | sed '/^$/d'`"
for i in ${SLICES}
OpenPOWER on IntegriCloud