summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2016-01-17 18:01:32 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2016-01-17 18:01:32 +0000
commit726bd8ffa7178164cfba8ec669fce4d622d9c7a9 (patch)
treee9df8299ea79425c8c7a2695df929947203b432c /distrib
parente48332dc777de809ec2ab575974ca50e3575d283 (diff)
Discard stderr of fdisk and pdisk.
disussed with and OK krw@
Diffstat (limited to 'distrib')
-rw-r--r--distrib/miniroot/install.sub7
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 3af8dd2ab86..d85eda65dd4 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.871 2016/01/12 00:17:05 rpe Exp $
+# $OpenBSD: install.sub,v 1.872 2016/01/17 18:01:31 rpe Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -317,9 +317,10 @@ disk_has() {
[[ -n $_part && -z $_p_part ]] && exit
if [[ -z $_p_part ]]; then
- $_cmd | grep -Eq "$_p_pttype"
+ $_cmd 2>/dev/null | grep -Eq "$_p_pttype"
else
- $_cmd | grep -Eq "$_p_pttype" && $_cmd | grep -Eq "$_p_part"
+ $_cmd 2>/dev/null | grep -Eq "$_p_pttype" &&
+ $_cmd 2>/dev/null | grep -Eq "$_p_part"
fi
}