Page MenuHomeFreeBSD

makefs: Fix "time" mtree attribute handling
ClosedPublic

Authored by mhorne063_gmail.com on Mar 18 2019, 6:14 PM.
Tags
None
Referenced Files
F132922408: D19627.id55205.diff
Tue, Oct 21, 5:21 AM
Unknown Object (File)
Sun, Oct 19, 4:41 PM
Unknown Object (File)
Sun, Oct 19, 4:41 PM
Unknown Object (File)
Sun, Oct 19, 2:26 AM
Unknown Object (File)
Sat, Oct 18, 2:47 PM
Unknown Object (File)
Thu, Oct 9, 12:21 AM
Unknown Object (File)
Tue, Oct 7, 6:52 AM
Unknown Object (File)
Sat, Oct 4, 2:30 AM
Subscribers

Details

Summary

When processing mtree(5) MANIFEST files, makefs(8) throws will throw an
error if it encounters an entry whose "time" attribute contains a
non-zero subsecond component (e.g. time=1551620152.987220000).

Update the handling logic to properly assign the subsecond component if
built with nanosecond support, or silently discard it otherwise.

Also, re-enable the time attribute for the kyua tests.

PR: 194703

Test Plan

Ran makefs using METALOG, which contains timestamps for the kernel.

Ran the kyua tests.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

usr.sbin/makefs/mtree.c
656 ↗(On Diff #55205)

makefs is built without HAVE_STRUCT_STAT_ST_MTIMENSEC, and fails to compile with it defined. D19626 makes the change required to fix this, and I have tested that with both of these changes nanoseconds are handled properly for a generated UFS image.

This revision is now accepted and ready to land.Mar 18 2019, 6:22 PM
This revision was automatically updated to reflect the committed changes.