diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 18:05:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 18:05:22 +0000 |
| commit | d8c056b94595b8c6c69152c5da41d0350f9e3f04 (patch) | |
| tree | 4b6d2c1ae6a5f3a9a48811c7e115a9d07a983525 | |
| parent | 9dc56479cf10a9aff67a58d2929fdaecdbe0d9e2 (diff) | |
use boot(RB_USERREQ | RB_HALT) to get back to the prom instead of
special openfirmware calls; discussed with miod
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 98074a22193..7533dd14046 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.61 2007/04/07 14:15:10 kettenis Exp $ */ +/* $OpenBSD: autoconf.c,v 1.62 2007/04/30 18:05:21 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -587,10 +587,8 @@ setroot() goto gotswap; } } - if (len == 4 && strncmp(buf, "exit", 4) == 0) { - doshutdownhooks(); - OF_exit(); - } + if (len == 4 && strncmp(buf, "exit", 4) == 0) + boot(RB_USERREQ | RB_HALT); dv = getdisk(buf, len, bp?bp->val[2]:0, &nrootdev); if (dv != NULL) { bootdv = dv; @@ -631,7 +629,7 @@ setroot() break; } if (len == 4 && strncmp(buf, "exit", 4) == 0) - OF_exit(); + boot(RB_USERREQ | RB_HALT); dv = getdisk(buf, len, 1, &nswapdev); if (dv) { if (dv->dv_class == DV_IFNET) |