summaryrefslogtreecommitdiffstats
path: root/release/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-03-27 01:48:44 +0000
committerjkh <jkh@FreeBSD.org>1999-03-27 01:48:44 +0000
commit2eeeee0a5a4aec9dc0e8c54bfd9611d440afe15d (patch)
tree3c032caf15195af92eba45b8baf097110485939e /release/sysinstall
parent93713238381196811772dc01a444e18cbd71dbf9 (diff)
downloadFreeBSD-src-2eeeee0a5a4aec9dc0e8c54bfd9611d440afe15d.zip
FreeBSD-src-2eeeee0a5a4aec9dc0e8c54bfd9611d440afe15d.tar.gz
1. Update TAPE to point to new CAM-style device name.
2. Don't prompt for removal twice on fixit floppy. Submitted by: jack <jack@germanium.xtalwind.net>
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/floppy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index f3b210f..ca958ed 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: floppy.c,v 1.31 1998/12/22 12:31:24 jkh Exp $
+ * $Id: floppy.c,v 1.32 1999/02/15 00:49:33 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -148,7 +148,7 @@ mediaShutdownFloppy(Device *dev)
msgDebug("Umount of floppy on %s failed: %s (%d)\n", mp, strerror(errno), errno);
else {
floppyMounted = FALSE;
- if (!variable_get(VAR_NONINTERACTIVE))
+ if (!variable_get(VAR_NONINTERACTIVE) && variable_cmp(SYSTEM_STATE, "fixit"))
msgConfirm("You may remove the floppy from %s", dev->description);
}
}
OpenPOWER on IntegriCloud