summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-01 17:41:37 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-01 17:41:37 +0000
commitde4279b6f56761c6a65a45529723aa6eca8c7469 (patch)
tree6a69d4ba1e215d52ca62588e1cb1abae463f0600 /sys/arch
parente6da1603dafdcfd4e72739aa84a145e3772d4692 (diff)
similar exit support for -a, to what i386 does
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/autoconf.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index 0882f432d7e..3529e012656 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.17 2007/01/15 23:19:05 jsg Exp $ */
+/* $OpenBSD: autoconf.c,v 1.18 2007/05/01 17:41:36 deraadt Exp $ */
/* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@@ -404,6 +404,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,
@@ -452,11 +454,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);
}
}
@@ -464,7 +466,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");