summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-02-13 14:02:59 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-02-13 14:02:59 +0000
commit7fa4446c2d24f0600f5f7f084fee267111adee30 (patch)
tree3c11b1792dde4240b7ec718a7cefb3f769e9cb9e
parentc54c85f1f3d0aa3ea8a198fa76a4242391494413 (diff)
Only add bsd.mp to the sets on IP30 so far, as this causes `are you sure your
installation is complete without bsd.mp.IP27' on multiprocessor Origin systems. This is temporary until we actually have a MP kernel for Origin. Noticed by jasper@
-rw-r--r--distrib/sgi/ramdisk/install.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index dca60e97ccc..75955b2255a 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.21 2010/01/19 19:55:52 miod Exp $
+# $OpenBSD: install.md,v 1.22 2010/02/13 14:02:58 miod Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,9 @@ NCPU=$(sysctl -n hw.ncpufound)
MDSETS="bsd.${IPARCH} bsd.rd.${IPARCH}"
SANESETS="bsd.${IPARCH}"
-if ((NCPU > 1)); then
+# Since we do not provide bsd.mp on IP27 yet, do not add bsd.mp.IP27 to the
+# sets, as this will cause a warning in sane_install()
+if ((NCPU > 1)) && ((IPARCH == 30)); then
MDSETS="${MDSETS} bsd.mp.${IPARCH}"
SANESETS="${SANESETS} bsd.mp.${IPARCH}"
fi