diff options
author | Robert Peichaer <rpe@cvs.openbsd.org> | 2013-11-16 18:37:28 +0000 |
---|---|---|
committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2013-11-16 18:37:28 +0000 |
commit | 240cdcbabc5239b94c9488aacdae734862dff715 (patch) | |
tree | 5746fecbe5e07ceb900cce2a71105e1b38c90570 /distrib | |
parent | b407967b2a1240c9187b42e40fb5072ed1638069 (diff) |
Remove AUTOROOT variable which is a leftover of r1.183 of install.sub
diff from Philipp e1c1bac6253dc54a1e89ddc046585792 at osteo dot net
ok krw@ halex@
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/alpha/common/install.md | 4 | ||||
-rw-r--r-- | distrib/amd64/common/install.md | 4 | ||||
-rw-r--r-- | distrib/armish/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/armv7/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/aviion/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/hppa/install.md | 4 | ||||
-rw-r--r-- | distrib/i386/common/install.md | 4 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/loongson/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/luna88k/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/miniroot/install.sh | 3 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/octeon/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/sparc/install.md | 4 | ||||
-rw-r--r-- | distrib/sparc64/common/install.md | 4 | ||||
-rw-r--r-- | distrib/vax/install.md | 4 | ||||
-rw-r--r-- | distrib/zaurus/ramdisk/install.md | 4 |
22 files changed, 43 insertions, 44 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index 58ba7330f72..40d813a3bc1 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.35 2012/10/16 16:45:04 deraadt Exp $ +# $OpenBSD: install.md,v 1.36 2013/11/16 18:37:26 rpe Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -49,7 +49,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 36827e94f9e..9d73a331cca 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.32 2012/10/15 17:21:04 deraadt Exp $ +# $OpenBSD: install.md,v 1.33 2013/11/16 18:37:26 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md index d7ca2fdcd76..5e270423bfe 100644 --- a/distrib/armish/ramdisk/install.md +++ b/distrib/armish/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.15 2012/07/10 14:25:00 halex Exp $ +# $OpenBSD: install.md,v 1.16 2013/11/16 18:37:26 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -92,7 +92,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index 1783d7f8241..fe5def313ff 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.3 2013/11/01 20:35:52 jasper Exp $ +# $OpenBSD: install.md,v 1.4 2013/11/16 18:37:26 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -195,7 +195,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/aviion/ramdisk/install.md b/distrib/aviion/ramdisk/install.md index bc963522ea1..5ddbc867db0 100644 --- a/distrib/aviion/ramdisk/install.md +++ b/distrib/aviion/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.2 2013/10/15 17:48:16 miod Exp $ +# $OpenBSD: install.md,v 1.3 2013/11/16 18:37:26 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -119,7 +119,7 @@ __EOT disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index f94090acdcb..990e0cc0c22 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.57 2012/07/10 14:25:00 halex Exp $ +# $OpenBSD: install.md,v 1.58 2013/11/16 18:37:27 rpe Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md index 332e9d9da19..4e286effee9 100644 --- a/distrib/hppa/install.md +++ b/distrib/hppa/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.21 2012/07/10 14:25:00 halex Exp $ +# $OpenBSD: install.md,v 1.22 2013/11/16 18:37:27 rpe Exp $ # # machine dependent section of installation/upgrade script. # @@ -24,7 +24,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index ebcaca93ed0..7cb45fd1c2d 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.55 2012/10/15 17:21:03 deraadt Exp $ +# $OpenBSD: install.md,v 1.56 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -106,7 +106,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index cdc8f5e5463..2b523c0a0c3 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.29 2012/10/17 02:36:16 deraadt Exp $ +# $OpenBSD: install.md,v 1.30 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md index fc18c5cd7c7..0aca76dc875 100644 --- a/distrib/loongson/ramdisk/install.md +++ b/distrib/loongson/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.12 2012/10/15 16:15:34 deraadt Exp $ +# $OpenBSD: install.md,v 1.13 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -138,7 +138,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md index ea9d6d67001..018e0bc1052 100644 --- a/distrib/luna88k/ramdisk/install.md +++ b/distrib/luna88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.16 2013/10/30 20:43:50 miod Exp $ +# $OpenBSD: install.md,v 1.17 2013/11/16 18:37:27 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -51,7 +51,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index 0532d05b885..b6aaa0f9846 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.53 2012/10/15 02:27:23 deraadt Exp $ +# $OpenBSD: install.md,v 1.54 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -177,7 +177,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 79d696d8a99..7555249b4fc 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.234 2013/10/31 19:15:20 halex Exp $ +# $OpenBSD: install.sh,v 1.235 2013/11/16 18:37:27 rpe Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -101,7 +101,6 @@ while :; do # /tmp/fstab.$DISK is created here with 'disklabel -f' or # 'disklabel -F' depending on the value of $FSTABFLAG. rm -f /tmp/*.$DISK - AUTOROOT=n md_prep_disklabel $DISK || { DISK= ; continue ; } # Make sure there is a '/' mount point. diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md index c80defd8e80..c7cf3847dfb 100644 --- a/distrib/mvme68k/ramdisk/install.md +++ b/distrib/mvme68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.42 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.43 2013/11/16 18:37:27 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -49,7 +49,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index e22195a5bc7..42685944dab 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.42 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.43 2013/11/16 18:37:27 rpe Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -52,7 +52,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/octeon/ramdisk/install.md b/distrib/octeon/ramdisk/install.md index fefefe52811..1729ea49134 100644 --- a/distrib/octeon/ramdisk/install.md +++ b/distrib/octeon/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2013/04/08 09:51:38 jasper Exp $ +# $OpenBSD: install.md,v 1.5 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -120,7 +120,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index 7fc992d41a2..a4fc9154724 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.31 2012/10/18 16:57:31 deraadt Exp $ +# $OpenBSD: install.md,v 1.32 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -150,7 +150,7 @@ __EOT disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md index fec94724e1f..a28c1a85393 100644 --- a/distrib/socppc/ramdisk/install.md +++ b/distrib/socppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.17 2012/10/16 23:07:20 deraadt Exp $ +# $OpenBSD: install.md,v 1.18 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 98322c0fffe..8d56eb83702 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.68 2012/10/17 02:06:39 deraadt Exp $ +# $OpenBSD: install.md,v 1.69 2013/11/16 18:37:27 rpe Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -54,7 +54,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md index 1bbe43905a9..5c7081988c9 100644 --- a/distrib/sparc64/common/install.md +++ b/distrib/sparc64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.39 2012/10/15 18:17:38 deraadt Exp $ +# $OpenBSD: install.md,v 1.40 2013/11/16 18:37:27 rpe Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -57,7 +57,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/vax/install.md b/distrib/vax/install.md index 31d1bf118c6..10a1d014cfe 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.39 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.40 2013/11/16 18:37:27 rpe Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -54,7 +54,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md index 74d53ecbfdc..a8c5903259d 100644 --- a/distrib/zaurus/ramdisk/install.md +++ b/distrib/zaurus/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.28 2012/07/10 14:25:00 halex Exp $ +# $OpenBSD: install.md,v 1.29 2013/11/16 18:37:27 rpe Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ md_prep_disklabel() { disklabel -h -A $_disk | egrep "^# |^ [a-p]:" ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a case $resp in - a*|A*) _op=-w ; AUTOROOT=y ;; + a*|A*) _op=-w ;; e*|E*) _op=-E ;; c*|C*) break ;; *) continue ;; |