upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skip errors from being unable to set modification and creation times. If

Browse source 
one of the directories in the filesystem hierarchy is a FAT mountpoint,
settings its times will fail, which would cause installation to abort.
Instead, make this a best-effort thing.

Handling this error is a hack and a better internal scheme for handling
this should be added to libarchive.
This commit is contained in:
Nathan Whitehorn 2018-01-02 05:22:54 +00:00
parent ad5b0f5b51
commit a5837f2c26
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.sbin/bsdinstall/distextract/distextract.c
View file

@ -310,7 +310,15 @@ extract_files(struct dpv_file_node *file, int out __unused)
archive = NULL;
file->status = DPV_STATUS_DONE;
return (100);
} else if (retval != ARCHIVE_OK) {
} else if (retval != ARCHIVE_OK &&
!(retval == ARCHIVE_WARN &&
strcmp(archive_error_string(archive), "Can't restore time") == 0)) {
/*
* Print any warning/error messages except inability to set
* ctime/mtime, which is not fatal, or even interesting,
* for our purposes. Would be nice if this were a libarchive
* option.
*/
snprintf(errormsg, sizeof(errormsg),
"Error while extracting %s: %s\n", file->name,
archive_error_string(archive));