DTRT with a release string of "none" and use the correct (updated)
mountpoint name for fixit. Submitted-By: joerg
This commit is contained in:
parent
32340ccd9e
commit
aa5b6f64ea
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=22032
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user