diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-05-01 17:35:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-05-01 17:35:57 +0000 |
| commit | e6da1603dafdcfd4e72739aa84a145e3772d4692 (patch) | |
| tree | 1a05a7fdc9be45449c8489f42bd9b25df1e5235b | |
| parent | 548a533c3fefb669d3b7fb65b1187a550aa9e4f9 (diff) | |
support exit at boot -a time
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 0721333c06e..f62b3e8bd37 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.70 2007/02/20 21:15:01 tom Exp $ */ +/* $OpenBSD: autoconf.c,v 1.71 2007/05/01 17:35:56 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -406,6 +406,8 @@ rootconf(void) cnpollc(FALSE); if (*name == '\0') break; + if (strcmp(name, "exit") == 0) + boot(RB_USERREQ); for (gc = genericconf; gc->gc_driver; gc++) if (gc->gc_driver->cd_ndevs && strncmp(gc->gc_name, name, @@ -454,11 +456,11 @@ rootconf(void) #endif } - printf("use one of: "); + printf("use one of: exit"); for (gc = genericconf; gc->gc_driver; gc++) { for (unit=0; unit < gc->gc_driver->cd_ndevs; unit++) { if (gc->gc_driver->cd_devs[unit]) - printf("%s%d[a-%c] ", gc->gc_name, + printf(" %s%d[a-%c]", gc->gc_name, unit, 'a'+MAXPARTITIONS-1); } } @@ -466,7 +468,7 @@ rootconf(void) for (ifp = TAILQ_FIRST(&ifnet); ifp != NULL; ifp = TAILQ_NEXT(ifp, if_list)) { if ((ifp->if_flags & IFF_BROADCAST)) - printf("%s ", ifp->if_xname); + printf(" %s", ifp->if_xname); } #endif printf("\n"); |