[src/netbsd-8]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2746e58e6c0a
branches:  netbsd-8
changeset: 434976:2746e58e6c0a
user:      snj <snj%NetBSD.org@localhost>
date:      Mon May 07 04:03:20 2018 +0000

description:
Pull up following revision(s) (requested by martin in ticket #798):
        usr.sbin/sysinst/disks.c: 1.14
Simplify and get rid of external "grep" dependency which is not available
on all install meadia.
Sugested by kre.

diffstat:

 usr.sbin/sysinst/disks.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 1610720e54d7 -r 2746e58e6c0a usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Mon May 07 04:00:18 2018 +0000
+++ b/usr.sbin/sysinst/disks.c  Mon May 07 04:03:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.13 2017/01/13 05:49:27 christos Exp $ */
+/*     $NetBSD: disks.c,v 1.13.6.1 2018/05/07 04:03:20 snj Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1480,11 +1480,12 @@
 static bool
 is_gpt(const char *dev)
 {
+
        check_available_binaries();
 
        if (!have_gpt)
                return false;
 
-       return !run_program(RUN_SILENT | RUN_ERROR_OK,
-               "sh -c 'gpt show %s |grep -e Pri\\ GPT\\ table'", dev);
+       return run_program(RUN_SILENT | RUN_ERROR_OK,
+               "gpt -qr header %s", dev) == 0;
 }