summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-10-27 21:27:43 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-10-27 21:27:43 +0000
commit13d8af4973d70702cc85cbc1dad3d24729bbf6f0 (patch)
tree33800caa379a877181b2060eed3bc77763007106 /sys
parent08dadc292de9a1210afe9467015e280ae2629847 (diff)
handle fdeject on root line, not swap line...
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/sparc/autoconf.c26
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: