From owner-svn-src-all@freebsd.org Tue Jan 2 05:22:55 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93219EB32AD;
Tue, 2 Jan 2018 05:22:55 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5CC996F611;
Tue, 2 Jan 2018 05:22:55 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w025Msnr059641;
Tue, 2 Jan 2018 05:22:54 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w025MsV2059640;
Tue, 2 Jan 2018 05:22:54 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201801020522.w025MsV2059640@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 2 Jan 2018 05:22:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r327486 - head/usr.sbin/bsdinstall/distextract
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/usr.sbin/bsdinstall/distextract
X-SVN-Commit-Revision: 327486
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jan 2018 05:22:55 -0000
Author: nwhitehorn
Date: Tue Jan 2 05:22:54 2018
New Revision: 327486
URL: https://svnweb.freebsd.org/changeset/base/327486
Log:
Skip errors from being unable to set modification and creation times. If
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.
Modified:
head/usr.sbin/bsdinstall/distextract/distextract.c
Modified: head/usr.sbin/bsdinstall/distextract/distextract.c
==============================================================================
--- head/usr.sbin/bsdinstall/distextract/distextract.c Tue Jan 2 04:35:56 2018 (r327485)
+++ head/usr.sbin/bsdinstall/distextract/distextract.c Tue Jan 2 05:22:54 2018 (r327486)
@@ -310,7 +310,15 @@ extract_files(struct dpv_file_node *file, int out __un
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));