summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-10-28 17:51:15 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-10-28 17:51:15 +0000
commit5634baa1daa7963e129559d0445118d6a6cf3b32 (patch)
tree215c278b98c94dd8096c5509a52cd8b98fc9689f /distrib/miniroot
parentf5225655c5f492306254889b0c8a081d4fba7000 (diff)
Move md_copy_kernel after install_sets and add check_kernel (which
should probably be used instead of md_copy_kernel once I am sure nothing actually uses md_copy_kernel to copy the kernel any more).
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sh6
-rw-r--r--distrib/miniroot/install.sub22
2 files changed, 24 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 6d76ece5eaa..4ad24a7ef49 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.41 1998/10/13 21:23:30 deraadt Exp $
+# $OpenBSD: install.sh,v 1.42 1998/10/28 17:51:14 millert Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -539,10 +539,10 @@ while [ "X${resp}" = X"" ]; do
fi
done
-md_copy_kernel
-
install_sets $THESETS
+md_copy_kernel
+
# Copy in configuration information and make devices in target root.
if [ ! -d /mnt/etc -o ! -d /mnt/usr/share/zoneinfo -o ! -d /mnt/dev ]; then
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index dbc62efb838..4812d1f120a 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sub,v 1.108 1998/10/19 19:22:18 deraadt Exp $
+# $OpenBSD: install.sub,v 1.109 1998/10/28 17:51:14 millert Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -2082,3 +2082,23 @@ _fstab=$1
echo "Done."
) < $_fstab
}
+
+check_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
+}