d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DTRT with a release string of "none" and use the correct (updated)

Browse Source 
mountpoint name for fixit.
Submitted-By: joerg
This commit is contained in:
Jordan K. Hubbard 1997-01-27 09:51:56 +00:00
parent 32340ccd9e
commit aa5b6f64ea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=22032
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/cdrom.c
View File

@ -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"

4
release/sysinstall/install.c
View File

@ -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;

4
usr.sbin/sade/install.c
View File

@ -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;

2
usr.sbin/sysinstall/cdrom.c
View File

@ -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"

4
usr.sbin/sysinstall/install.c
View File

@ -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;