diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 18:37:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 18:37:01 +0000 |
| commit | d4d905fc80f79a09a6cca55c91f89796efd06fd1 (patch) | |
| tree | d242a8ec4fb934aeee1009af48bf5182d1051068 /sys/arch/sparc | |
| parent | 3de432f5259aee7b49fc6256d862f6e532a32559 (diff) | |
check for exit string earlier
Diffstat (limited to 'sys/arch/sparc')
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 3d7c5040e2d..5e1b2c5b2e8 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.75 2007/04/30 18:11:03 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.76 2007/04/30 18:37:00 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -1936,6 +1936,8 @@ setroot() strlcpy(buf, bootdv->dv_xname, sizeof buf); len = strlen(buf); } + if (len == 4 && strncmp(buf, "exit", 4) == 0) + boot(RB_USERREQ | RB_HALT); if (len > 0 && buf[len - 1] == '*') { buf[--len] = '\0'; dv = getdisk(buf, len, 1, &nrootdev); @@ -1945,8 +1947,6 @@ setroot() goto gotswap; } } - 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; @@ -1969,6 +1969,8 @@ setroot() bootdv->dv_class == DV_DISK?'b':' '); printf(": "); len = getstr(buf, sizeof(buf)); + if (len == 4 && strncmp(buf, "exit", 4) == 0) + boot(RB_USERREQ | RB_HALT); if (len == 0 && bootdv != NULL) { switch (bootdv->dv_class) { case DV_IFNET: @@ -1986,8 +1988,6 @@ setroot() } break; } - if (len == 4 && strncmp(buf, "exit", 4) == 0) - boot(RB_USERREQ | RB_HALT); dv = getdisk(buf, len, 1, &nswapdev); if (dv) { if (dv->dv_class == DV_IFNET) |