diff options
| author |   deraadt <deraadt@openbsd.org> | 1995-10-27 21:27:42 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1995-10-27 21:27:42 +0000 |
| commit | 87e51f5d056f9baea251250690eb1987e7b33c66 (patch) | |
| tree | 0fabfad86078cca567f99351e103182e0a37b043 | |
| parent | attempt to open name as given incase it is a relative pathname (diff) | |
| download | wireguard-openbsd-87e51f5d056f9baea251250690eb1987e7b33c66.tar.xz wireguard-openbsd-87e51f5d056f9baea251250690eb1987e7b33c66.zip | |
handle fdeject on root line, not swap line...
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 8cc8867a47f..e329b1b2abd 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1492,6 +1492,19 @@ setroot() bootdv->dv_class == DV_DISK?'a':' '); printf(": "); len = getstr(buf, sizeof(buf)); +#if NFD > 0 + /* + * I will go punish myself now. + */ + if (len > 0 && strcmp(buf, "fdeject")==0) { + struct mtop mtop; + + bzero(&mtop, sizeof mtop); + mtop.mt_op = MTOFFL; + (void) fdioctl(0, MTIOCTOP, &mtop, 0); + continue; + } +#endif /* NFD */ if (len == 0 && bootdv != NULL) { strcpy(buf, bootdv->dv_xname); len = strlen(buf); @@ -1528,19 +1541,6 @@ setroot() bootdv->dv_class == DV_DISK?'b':' '); printf(": "); len = getstr(buf, sizeof(buf)); -#if NFD > 0 - /* - * I will go punish myself now. - */ - if (len > 0 && strcmp(buf, "fdeject")==0) { - struct mtop mtop; - - bzero(&mtop, sizeof mtop); - mtop.mt_op = MTOFFL; - (void) fdioctl(0, MTIOCTOP, &mtop, 0); - continue; - } -#endif /* NFD */ if (len == 0 && bootdv != NULL) { switch (bootdv->dv_class) { case DV_IFNET: |