diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 17:35:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-04-30 17:35:24 +0000 |
| commit | 9dc56479cf10a9aff67a58d2929fdaecdbe0d9e2 (patch) | |
| tree | 19653496883850acaa3e549537f92a4ce3f4b8e4 /sys/arch | |
| parent | 6b0ed8edbc20d4e4fa10b139ccad07ce00efc174 (diff) | |
support "exit" as a RB_ASKNAME choice; discussed with miod
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/alpha/autoconf.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index 30166fdef8d..5ed8cfad53d 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.27 2006/01/26 02:43:28 aaron Exp $ */ +/* $OpenBSD: autoconf.c,v 1.28 2007/04/30 17:35:23 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */ /* @@ -174,7 +174,7 @@ getdisk(str, len, defpart, devp) register 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 @@ -186,7 +186,7 @@ getdisk(str, len, defpart, devp) printf(" %s", dv->dv_xname); #endif } - printf(" halt\n"); + printf("\n"); } return (dv); } @@ -204,8 +204,8 @@ parsedisk(str, len, defpart, devp) if (len == 0) return (NULL); - if (len == 4 && !strcmp(str, "halt")) - boot(RB_HALT /* , NULL */); + if (len == 4 && !strcmp(str, "exit")) + boot(RB_USERREQ); cp = str + len - 1; c = *cp; @@ -317,6 +317,8 @@ setroot() strlcpy(buf, bootdv->dv_xname, sizeof buf); len = strlen(buf); } + if (len == 4 && !strcmp(buf, "exit")) + boot(RB_USERREQ); if (len > 0 && buf[len - 1] == '*') { buf[--len] = '\0'; dv = getdisk(buf, len, 1, &nrootdev); @@ -364,6 +366,8 @@ setroot() swapdv = rootdv; break; } + if (len == 4 && !strcmp(buf, "exit")) + boot(RB_USERREQ); dv = getdisk(buf, len, 1, &nswapdev); if (dv) { if (dv->dv_class == DV_IFNET) |