summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2002-06-07 19:31:09 +0000
committerJason Wright <jason@cvs.openbsd.org>2002-06-07 19:31:09 +0000
commit809d91b9fbe7b54ac8b35443994575c8c47810da (patch)
treebd2e3bafbe8bf173a0e630c9477abe2dc87aef76
parent96c246e9216662f49add6f99e5e12f8c6d0c6cd0 (diff)
add a way to exit from the 'root device' prompt if we haven't found ANY possibilities. Power cycling this machine is SLOW!
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 015b1663fdb..e4f733ec800 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.23 2002/04/10 04:17:50 jason Exp $ */
+/* $OpenBSD: autoconf.c,v 1.24 2002/06/07 19:31:08 jason Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -663,6 +663,8 @@ setroot()
goto gotswap;
}
}
+ if (len == 4 && strncmp(buf, "exit", 4) == 0)
+ OF_exit();
dv = getdisk(buf, len, bp?bp->val[2]:0, &nrootdev);
if (dv != NULL) {
bootdv = dv;
@@ -702,6 +704,8 @@ setroot()
}
break;
}
+ if (len == 4 && strncmp(buf, "exit", 4) == 0)
+ OF_exit();
dv = getdisk(buf, len, 1, &nswapdev);
if (dv) {
if (dv->dv_class == DV_IFNET)
@@ -844,7 +848,7 @@ getdisk(str, len, defpart, devp)
struct device *dv;
if ((dv = parsedisk(str, len, defpart, devp)) == NULL) {
- printf("use one of:");
+ printf("use one of: exit");
#ifdef RAMDISK_HOOKS
printf(" %s[a-p]", fakerdrootdev.dv_xname);
#endif