diff options
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/alpha/ramdisk/install.md | 20 | ||||
-rw-r--r-- | distrib/amiga/install.md | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 20 | ||||
-rw-r--r-- | distrib/powerpc/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/sparc/install.md | 8 | ||||
-rw-r--r-- | distrib/sun3/ramdisk/install.md | 20 |
6 files changed, 12 insertions, 63 deletions
diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/ramdisk/install.md index 84ae8327107..3bfdea00aa4 100644 --- a/distrib/alpha/ramdisk/install.md +++ b/distrib/alpha/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.24 1998/09/24 06:39:49 millert Exp $ +# $OpenBSD: install.md,v 1.25 1998/10/28 17:53:27 millert Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -50,23 +50,7 @@ md_machine_arch() { } md_copy_kernel() { - if [ ! -s /mnt/bsd ]; then - echo "" - echo "Warning, no kernel installed!" - echo "You did not unpack a file set containing a kernel." - echo "This is needed to boot. Please note that the install" - echo "install kernel is not suitable for general use." - echo -n "Escape to shell add /mnt/bsd by hand? [y] " - getresp "y" - case "$resp" in - y*|Y*) - echo "Type 'exit' to return to install." - sh - ;; - *) - ;; - esac - fi + check_kernel } md_set_term() { diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md index fb27c591e25..58b4f61d971 100644 --- a/distrib/amiga/install.md +++ b/distrib/amiga/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.6 1998/09/11 22:55:45 millert Exp $ +# $OpenBSD: install.md,v 1.7 1998/10/28 17:53:28 millert Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -143,7 +143,7 @@ md_prep_disklabel() } md_copy_kernel() { - # We use a "kernel" set instead + check_kernel } md_welcome_banner() { diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index a4665d62e34..bf9b57ba71a 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.12 1998/09/11 22:55:45 millert Exp $ +# $OpenBSD: install.md,v 1.13 1998/10/28 17:53:29 millert Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -448,23 +448,7 @@ __md_prep_disklabel_1 } md_copy_kernel() { - if [ ! -s /mnt/bsd ]; then - echo "" - echo "Warning, no kernel installed!" - echo "You did not unpack a file set containing a kernel." - echo "This is needed to boot. Please note that the install" - echo "install kernel is not suitable for general use." - echo -n "Escape to shell add /mnt/bsd by hand? [y] " - getresp "y" - case "$resp" in - y*|Y*) - echo "Type 'exit' to return to install." - sh - ;; - *) - ;; - esac - fi + check_kernel } # Note, while they might not seem machine-dependent, the diff --git a/distrib/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md index 15559ebd1fe..90c2a92a0fd 100644 --- a/distrib/powerpc/ramdisk/install.md +++ b/distrib/powerpc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.7 1998/09/15 05:45:50 rahnds Exp $ +# $OpenBSD: install.md,v 1.8 1998/10/28 17:53:30 millert Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -327,6 +327,7 @@ __md_prep_disklabel_1 } md_copy_kernel() { + check_kernel } md_welcome_banner() { diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index fa6cdd49811..ec53722f4f9 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.22 1998/10/09 11:21:03 deraadt Exp $ +# $OpenBSD: install.md,v 1.23 1998/10/28 17:53:29 millert Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -207,11 +207,7 @@ __md_prep_disklabel_1 } md_copy_kernel() { - if [ -f /bsd ]; then - echo -n "Copying kernel..." - cp -p /bsd /mnt/bsd - echo "done." - fi + check_kernel } md_welcome_banner() { diff --git a/distrib/sun3/ramdisk/install.md b/distrib/sun3/ramdisk/install.md index 2d6fcb47314..5a533f62c32 100644 --- a/distrib/sun3/ramdisk/install.md +++ b/distrib/sun3/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.2 1998/09/11 22:55:44 millert Exp $ +# $OpenBSD: install.md,v 1.3 1998/10/28 17:53:31 millert Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -383,23 +383,7 @@ __md_prep_disklabel_1 } md_copy_kernel() { - if [ ! -s /mnt/bsd ]; then - echo "" - echo "Warning, no kernel installed!" - echo "You did not unpack a file set containing a kernel." - echo "This is needed to boot. Please note that the install" - echo "install kernel is not suitable for general use." - echo -n "Escape to shell add /mnt/bsd by hand? [y] " - getresp "y" - case "$resp" in - y*|Y*) - echo "Type 'exit' to return to install." - sh - ;; - *) - ;; - esac - fi + check_kernel } # Note, while they might not seem machine-dependent, the |