From 4747e960865efc706bace2562025079e9d787761 Mon Sep 17 00:00:00 2001 From: jkh Date: Mon, 27 Jan 1997 09:51:56 +0000 Subject: DTRT with a release string of "none" and use the correct (updated) mountpoint name for fixit. Submitted-By: joerg --- release/sysinstall/cdrom.c | 2 +- release/sysinstall/install.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 6918ae2..443f39a 100644 --- a/release/sysinstall/cdrom.c +++ b/release/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" diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index a567f8b..7c7a640 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -276,10 +276,10 @@ installFixitCDROM(dialogMenuItem *self) break; } - /* Since the fixit code expects everything to be in /mnt2, and the CDROM mounting stuff /cdrom, do + /* Since the fixit code expects everything to be in /mnt2, and the CDROM mounting stuff /dist, do * a little kludge dance here.. */ - if (symlink("/cdrom", "/mnt2")) { + if (symlink("/dist", "/mnt2")) { msgConfirm("Unable to symlink /mnt2 to the CDROM mount point. Please report this\n" "unexpected failure to bugs@freebsd.org."); return DITEM_FAILURE; -- cgit v1.1