diff options
| author |   rpe <rpe@openbsd.org> | 2016-01-01 00:47:51 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2016-01-01 00:47:51 +0000 |
| commit | 6b51b25305af24c0c7e351612f111d1aec6d8b8d (patch) | |
| tree | 64396259d03a01136de3a4286187ea726a6869bd | |
| parent | Document the -h option for chmod and chflags, rewording the chgrp(1) and (diff) | |
| download | wireguard-openbsd-6b51b25305af24c0c7e351612f111d1aec6d8b8d.tar.xz wireguard-openbsd-6b51b25305af24c0c7e351612f111d1aec6d8b8d.zip | |
- enable activation of MP kernel for IP27
- use IPARCH instead of sysctl again
- use for-loop to copy kernels
feedback, tested and OK visa@
no objections krw@
| -rw-r--r-- | distrib/sgi/ramdisk/install.md | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index c0fface7910..4fe10496d25 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.38 2015/12/27 19:39:28 rpe Exp $ +# $OpenBSD: install.md,v 1.39 2016/01/01 00:47:51 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,9 +37,7 @@ NCPU=$(sysctl -n hw.ncpufound) MDSETS="bsd.$IPARCH bsd.rd.$IPARCH" SANESETS="bsd.$IPARCH" -# 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 == IP30 ]]; then +if ((NCPU > 1)); then MDSETS="$MDSETS bsd.mp.$IPARCH" SANESETS="$SANESETS bsd.mp.$IPARCH" fi @@ -49,13 +47,13 @@ md_installboot() { local _disk=$1 echo "Installing boot loader in volume header." - if ! /usr/mdec/sgivol -w boot /mnt/usr/mdec/boot-$(sysctl -n hw.model) $_disk; then + if ! /usr/mdec/sgivol -w boot /mnt/usr/mdec/boot-$IPARCH $_disk; then echo "\nWARNING: Boot install failed. Booting from disk will not be possible" fi - [[ -f /mnt/bsd.$IPARCH ]] && mv /mnt/bsd.$IPARCH /mnt/bsd - [[ -f /mnt/bsd.mp.$IPARCH ]] && mv /mnt/bsd.mp.$IPARCH /mnt/bsd.mp - [[ -f /mnt/bsd.rd.$IPARCH ]] && mv /mnt/bsd.rd.$IPARCH /mnt/bsd.rd + for _k in /mnt/bsd{,.mp,.rd}; do + [[ -f $_k.$IPARCH ]] && mv $_k.$IPARCH $_k + done } md_prep_disklabel() |