Date: Sat, 8 Jan 2011 20:25:00 +0000 (UTC) From: Josh Paetzel <jpaetzel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r217164 - in head/usr.sbin/pc-sysinstall: backend backend-query Message-ID: <201101082025.p08KP0AX003269@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jpaetzel (ports committer) Date: Sat Jan 8 20:25:00 2011 New Revision: 217164 URL: http://svn.freebsd.org/changeset/base/217164 Log: More elegant way to detect MBR vs. GPT Submitted by: nwhitehorn Approved by: imp Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Sat Jan 8 19:50:13 2011 (r217163) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Sat Jan 8 20:25:00 2011 (r217164) @@ -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" Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Sat Jan 8 19:50:13 2011 (r217163) +++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Sat Jan 8 20:25:00 2011 (r217164) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101082025.p08KP0AX003269>