From 88536531d2d0b83470f774fb10212bdd5c3b0213 Mon Sep 17 00:00:00 2001 From: rpe Date: Fri, 15 Aug 2014 09:45:54 +0000 Subject: [PATCH] Align install.md files with installer style. - { foo ; bar ; } -> { foo; bar; } - if foo ; then -> if foo; then OK halex@ --- distrib/alpha/common/install.md | 4 ++-- distrib/amd64/common/install.md | 6 +++--- distrib/aviion/ramdisk/install.md | 4 ++-- distrib/hppa/install.md | 6 +++--- distrib/i386/common/install.md | 6 +++--- distrib/loongson/ramdisk/install.md | 6 +++--- distrib/luna88k/ramdisk/install.md | 4 ++-- distrib/macppc/ramdisk/install.md | 12 ++++++------ distrib/sparc64/common/install.md | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index 00cc8b5e99c..339c3c35848 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.37 2014/02/03 05:35:40 miod Exp $ +# $OpenBSD: install.md,v 1.38 2014/08/15 09:45:54 rpe Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -34,7 +34,7 @@ MDXAPERTURE=1 NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { # Use cat to avoid holes created by cp(1) diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 0d9c9353fb2..74580dd6b93 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.35 2014/07/20 20:12:41 deraadt Exp $ +# $OpenBSD: install.md,v 1.36 2014/08/15 09:45:54 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,10 +37,10 @@ MDXDM=y MDLID=y NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { - if ! installboot -r /mnt ${1} ; then + if ! installboot -r /mnt ${1}; then echo "\nFailed to install bootblocks." echo "You will not be able to boot OpenBSD from ${1}." exit diff --git a/distrib/aviion/ramdisk/install.md b/distrib/aviion/ramdisk/install.md index 5c15bf6d504..f2e812d5a69 100644 --- a/distrib/aviion/ramdisk/install.md +++ b/distrib/aviion/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2014/01/25 17:55:57 miod Exp $ +# $OpenBSD: install.md,v 1.5 2014/08/15 09:45:54 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -34,7 +34,7 @@ MDTERM=vt100 NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } _mdnoautoinstallboot=n diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md index 467a582d35a..9a06c44ebb4 100644 --- a/distrib/hppa/install.md +++ b/distrib/hppa/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.23 2014/02/23 11:08:02 jsing Exp $ +# $OpenBSD: install.md,v 1.24 2014/08/15 09:45:54 rpe Exp $ # # machine dependent section of installation/upgrade script. # @@ -6,10 +6,10 @@ MDTERM=vt100 NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { - if ! installboot -r /mnt ${1} ; then + if ! installboot -r /mnt ${1}; then echo "\nFailed to install bootblocks." echo "You will not be able to boot OpenBSD from ${1}." exit diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index d7071dde795..992dc1bc8a7 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.58 2014/07/20 20:12:41 deraadt Exp $ +# $OpenBSD: install.md,v 1.59 2014/08/15 09:45:54 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,10 +37,10 @@ MDXDM=y MDLID=y NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { - if ! installboot -r /mnt ${1} ; then + if ! installboot -r /mnt ${1}; then echo "\nFailed to install bootblocks." echo "You will not be able to boot OpenBSD from ${1}." exit diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md index 0aca76dc875..9189ff50a07 100644 --- a/distrib/loongson/ramdisk/install.md +++ b/distrib/loongson/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.13 2013/11/16 18:37:27 rpe Exp $ +# $OpenBSD: install.md,v 1.14 2014/08/15 09:45:54 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -115,9 +115,9 @@ $(fdisk ${_disk}) __EOT fdisk -e $_disk fdisk $_disk | grep -q '^..: 83 ' || \ - { echo "\nNo Linux files (id 83) partition!\n" ; continue ; } + { echo "\nNo Linux files (id 83) partition!\n"; continue; } fdisk $_disk | grep -q "^..: A6 " || \ - { echo "\nNo OpenBSD (id A6) partition!\n" ; continue ; } + { echo "\nNo OpenBSD (id A6) partition!\n"; continue; } disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk break ;; o*|O*) break ;; diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md index 018e0bc1052..385be398cb8 100644 --- a/distrib/luna88k/ramdisk/install.md +++ b/distrib/luna88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.17 2013/11/16 18:37:27 rpe Exp $ +# $OpenBSD: install.md,v 1.18 2014/08/15 09:45:54 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -35,7 +35,7 @@ MDTERM=vt100 MDROOTFSOPT="-f 1024 -b 8192" NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { cat /mnt/usr/mdec/boot > /mnt/boot diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index b6aaa0f9846..7e600bec582 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.54 2013/11/16 18:37:27 rpe Exp $ +# $OpenBSD: install.md,v 1.55 2014/08/15 09:45:54 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ MDXAPERTURE=2 NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { local _disk=$1 @@ -115,11 +115,11 @@ $(fdisk $_disk) __EOT fdisk -e $_disk fdisk $_disk | grep -q '^..: 06 ' || \ - { echo "\nNo DOS (id 06) partition!\n" ; continue ; } + { echo "\nNo DOS (id 06) partition!\n"; continue; } fdisk $_disk | grep -q '^\*.: 06 ' || \ - { echo "\nNo active DOS partition!\n" ; continue ; } + { echo "\nNo active DOS partition!\n"; continue; } fdisk $_disk | grep -q "^..: A6 " || \ - { echo "\nNo OpenBSD (id A6) partition!\n" ; continue ; } + { echo "\nNo OpenBSD (id A6) partition!\n"; continue; } break ;; o*|O*) break ;; esac @@ -136,7 +136,7 @@ md_prep_HFS() { _q= _d=Modify md_has_hfs_openbsd $_disk && \ - { _q="Use the (O)penBSD partition, " ; _d=OpenBSD ; } + { _q="Use the (O)penBSD partition, "; _d=OpenBSD; } pdisk -l /dev/${_disk}c ask "$_q(M)odify a partition or (A)bort?" "$_d" case $resp in diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md index 5c7081988c9..0ff310a5fa5 100644 --- a/distrib/sparc64/common/install.md +++ b/distrib/sparc64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.40 2013/11/16 18:37:27 rpe Exp $ +# $OpenBSD: install.md,v 1.41 2014/08/15 09:45:54 rpe Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -38,7 +38,7 @@ MDXAPERTURE=1 MDXDM=y NCPU=$(sysctl -n hw.ncpufound) -((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; } md_installboot() { # Use cat to avoid holes created by cp(1) -- 2.20.1