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

Ignore any failures with the "local" distribution since it's not present

Browse Source 
on release CDs and so will normally fail.
installCommit() returns a DITEM_ value, not a Boolean.
distExtractAll() returns a Boolean, not a DITEM_ value.

Reported by:	kensmith
MFC after:	3 days
This commit is contained in:
Rebecca Cran 2010-12-06 20:55:14 +00:00
parent 5f5ca78b03
commit 21866e59c2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/sysinstall/dist.c
View File

@ -757,6 +757,9 @@ distExtract(char *parent, Distribution *me)
canceled = 1;
status = FALSE;
} else {
// ignore any failures with DIST_LOCAL
status = TRUE;
}
}
break;
@ -913,7 +916,7 @@ distExtractAll(dialogMenuItem *self)
restorescr(w);
if (extract_status == FALSE)
status = DITEM_FAILURE;
status = FALSE;
return status;
}

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

@ -855,7 +855,7 @@ installCommit(dialogMenuItem *self)
i = distExtractAll(self);
if (i == FALSE)
return FALSE;
return DITEM_FAILURE;
/* When running as init, *now* it's safe to grab the rc.foo vars */
installEnvironment();