summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2015-12-29 11:16:15 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2015-12-29 11:16:15 +0000
commitce588e0f2011ecfa2929d25676e93475f9644cfb (patch)
tree897a33e1809416625eb93683c0ad09ba3a1a2f7c
parent74f7c840cad3e1dff186088b4fb148193beea69c (diff)
Change patterns in case-blocks from a*|A* to [aA]*
OK halex@ krw@
Diffstat
-rw-r--r--distrib/amd64/common/install.md10
-rw-r--r--distrib/armish/ramdisk/install.md8
-rw-r--r--distrib/armv7/ramdisk/install.md6
-rw-r--r--distrib/i386/common/install.md8
-rw-r--r--distrib/landisk/ramdisk/install.md8
-rw-r--r--distrib/loongson/ramdisk/install.md8
-rw-r--r--distrib/macppc/ramdisk/install.md8
-rw-r--r--distrib/octeon/ramdisk/install.md8
-rw-r--r--distrib/socppc/ramdisk/install.md8
-rw-r--r--distrib/zaurus/ramdisk/install.md8
10 files changed, 40 insertions, 40 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 8cf13f0f6b0..da51aeb9bc7 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.49 2015/12/28 17:00:13 rpe Exp $
+# $OpenBSD: install.md,v 1.50 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -69,12 +69,12 @@ md_prep_fdisk() {
ask "$_q or (E)dit?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- g*|G*)
+ [gG]*)
if [[ $MDEFI != y ]]; then
ask_yn "An EFI/GPT disk may not boot. Proceed?"
[[ $resp == n ]] && continue
@@ -84,7 +84,7 @@ md_prep_fdisk() {
fdisk -iy -g -b 960 $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
if disk_has $_disk gpt; then
# Manually configure the GPT.
cat <<__EOT
@@ -123,7 +123,7 @@ __EOT
echo -n "No OpenBSD partition in MBR,"
fi
echo "try again." ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
if [[ $_disk == $ROOTDISK ]] && disk_has $_disk gpt &&
! disk_has $_disk gpt efisys; then
diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md
index 556fefe7c0d..0dcf77f15fe 100644
--- a/distrib/armish/ramdisk/install.md
+++ b/distrib/armish/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.24 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.25 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -51,12 +51,12 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -70,7 +70,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 8797ea9153a..eb9da182027 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.22 2015/12/23 13:31:22 rpe Exp $
+# $OpenBSD: install.md,v 1.23 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$ or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Creating a ${bootfstype} partition and an OpenBSD partition for rest of $_disk..."
fdisk -e ${_disk} <<__EOT >/dev/null
reinit
@@ -193,7 +193,7 @@ __EOT
disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk
newfs -t ${bootfstype} ${newfs_args} ${_disk}i
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index d351d2cecf4..ee6339529e1 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.68 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.69 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -62,12 +62,12 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -81,7 +81,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md
index 9e9a74d0372..17dd2031f3d 100644
--- a/distrib/landisk/ramdisk/install.md
+++ b/distrib/landisk/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.39 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.40 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -56,12 +56,12 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -75,7 +75,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md
index 457e48032a8..8f417130421 100644
--- a/distrib/loongson/ramdisk/install.md
+++ b/distrib/loongson/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.23 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.24 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
case $(sysctl -n hw.product) in
Gdium)
_s=32
@@ -104,7 +104,7 @@ __EOT
disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk
newfs -qt ext2fs $_o ${_disk}i
break ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -127,7 +127,7 @@ __EOT
{ echo "\nNo OpenBSD (id A6) partition!\n"; continue; }
disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk
break ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
break ;;
esac
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 9bf321eeede..d4c617537ee 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.65 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.66 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -81,13 +81,13 @@ __EOT
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Creating a 1MB DOS partition and an OpenBSD partition for rest of $_disk..."
dd if=/dev/zero of=/dev/r${_disk}c bs=1m count=1
fdisk -iy $_disk >/dev/null
echo "done."
break ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -109,7 +109,7 @@ __EOT
disk_has $_disk mbr openbsd ||
{ echo "\nNo OpenBSD (id A6) partition!\n"; continue; }
break ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
break ;;
esac
diff --git a/distrib/octeon/ramdisk/install.md b/distrib/octeon/ramdisk/install.md
index 01cd350a421..053fffdb411 100644
--- a/distrib/octeon/ramdisk/install.md
+++ b/distrib/octeon/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.13 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.14 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Creating a FAT partition and an OpenBSD partition for rest of $_disk..."
fdisk -e ${_disk} <<__EOT >/dev/null
reinit
@@ -86,7 +86,7 @@ __EOT
disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk
newfs -t msdos ${_disk}i
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -103,7 +103,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md
index 4f7df51980a..10fe9d554c4 100644
--- a/distrib/socppc/ramdisk/install.md
+++ b/distrib/socppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.26 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.27 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -59,12 +59,12 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -78,7 +78,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md
index b353afdfea1..482e2ef0752 100644
--- a/distrib/zaurus/ramdisk/install.md
+++ b/distrib/zaurus/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.39 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.40 2015/12/29 11:16:14 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,12 +53,12 @@ md_prep_fdisk() {
fi
ask "Use (W)hole disk$_q or (E)dit the MBR?" "$_d"
case $resp in
- w*|W*)
+ [wW]*)
echo -n "Setting OpenBSD MBR partition to whole $_disk..."
fdisk -iy $_disk >/dev/null
echo "done."
return ;;
- e*|E*)
+ [eE]*)
# Manually configure the MBR.
cat <<__EOT
@@ -72,7 +72,7 @@ __EOT
fdisk -e ${_disk}
disk_has $_disk mbr openbsd && return
echo No OpenBSD partition in MBR, try again. ;;
- o*|O*)
+ [oO]*)
[[ $_d == OpenBSD ]] || continue
return ;;
esac
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:01:49 +0000