diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-27 09:51:56 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-27 09:51:56 +0000 |
| commit | 4747e960865efc706bace2562025079e9d787761 (patch) | |
| tree | bc0993ff281792a4920a04192fe8bc991db1ef69 /usr.sbin/sysinstall/cdrom.c | |
| parent | 63bae8ec19e886354ad093f81ec42f53de912f31 (diff) | |
| download | FreeBSD-src-4747e960865efc706bace2562025079e9d787761.zip FreeBSD-src-4747e960865efc706bace2562025079e9d787761.tar.gz | |
DTRT with a release string of "none" and use the correct (updated)
mountpoint name for fixit.
Submitted-By: joerg
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 6918ae2..443f39a 100644 --- a/usr.sbin/sysinstall/cdrom.c +++ b/usr.sbin/sysinstall/cdrom.c @@ -99,7 +99,7 @@ mediaInitCDROM(Device *dev) if (readInfo && (DITEM_STATUS(attr_parse_file(cd_attr, string_concat(mountpoint, "/cdrom.inf"))) == DITEM_FAILURE || - !(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) { + !(cp = attr_match(cd_attr, "CD_VERSION")) || (strcmp(cp, variable_get(VAR_RELNAME)) && strcmp("none", variable_get(VAR_RELNAME))))) { if (!cp) msgConfirm("Unable to find a %s/cdrom.inf file.\n" "Either this is not a FreeBSD CDROM, there is a problem with\n" |
