aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/attr.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-06-11 05:06:32 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-06-11 05:06:32 +0000
commit3ee8cec8545ee16d241b11023e0ff74015b8c6f1 (patch)
tree24ad94c120c94d6886a598cbbb915b7c03601d03 /release/sysinstall/attr.c
parent7966b47a3e70068c82cd62d8a38b9ad085774c6f (diff)
downloadsrc-3ee8cec8545ee16d241b11023e0ff74015b8c6f1.tar.gz
src-3ee8cec8545ee16d241b11023e0ff74015b8c6f1.zip
Come up with a scheme for stamping the FreeBSD version number on CDs,
allowing sysinstall to automagically detect, mount and select an appropriate FreeBSD CDROM as the installation media. Defining "appropriate" also requires that you check the version numbers since an older FreeBSD CD could be in the drive, which is the purpose of this patch.
Notes
Notes: svn path=/head/; revision=16291
Diffstat (limited to 'release/sysinstall/attr.c')
-rw-r--r--release/sysinstall/attr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c
index b65cd0cd9f2b..a09ef4b77449 100644
--- a/release/sysinstall/attr.c
+++ b/release/sysinstall/attr.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: attr.c,v 1.5 1996/04/13 13:31:22 jkh Exp $
+ * $Id: attr.c,v 1.6 1996/04/23 01:29:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -44,13 +44,15 @@
int
attr_parse_file(Attribs *attr, char *file)
{
- int fd;
+ int fd, status;
if ((fd = open(file, O_RDONLY)) == -1) {
msgConfirm("Cannot open the information file `%s': %s (%d)", file, strerror(errno), errno);
return DITEM_FAILURE;
}
- return attr_parse(attr, fd);
+ status = attr_parse(attr, fd);
+ close(fd);
+ return status;
}
int