summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Traina <pst@FreeBSD.org>1997-04-01 02:00:42 +0000
committerPaul Traina <pst@FreeBSD.org>1997-04-01 02:00:42 +0000
commit240a4c64d5571a9861ffe24c34be144a801b82c4 (patch)
tree98e480321a8a6309e912a3b7a9b4b6cd5d2a332c
parent406fab58af87ad21f7cfc0f70ac8d3729d0f31d7 (diff)
Notes
-rw-r--r--release/sysinstall/variable_load.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/release/sysinstall/variable_load.c b/release/sysinstall/variable_load.c
index 63b0d419edca..e48e3d6c350b 100644
--- a/release/sysinstall/variable_load.c
+++ b/release/sysinstall/variable_load.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $Id$
+ * $Id: variable_load.c,v 1.1 1997/03/19 10:09:28 jkh Exp $
*
* Copyright (c) 1997
* Paul Traina. All rights reserved.
@@ -81,7 +81,8 @@ variableLoad(dialogMenuItem * self)
if (DITEM_STATUS(mediaSetFloppy(NULL)) == DITEM_FAILURE ||
mediaDevice->init(mediaDevice)) {
msgConfirm("Unable to access floppy.");
- return DITEM_FAILURE | what;
+ what |= DITEM_FAILURE;
+ goto terminate_device;
}
fp = mediaDevice->get(mediaDevice, cp, TRUE);
@@ -107,7 +108,7 @@ terminate_file:
fclose(fp);
terminate_device:
- mediaDevice->shutdown(mediaDevice);
+ mediaClose();
return what;
}