nanobsd: Use mtree -C to produce the metalog
ClosedPublic
Actions

Authored by jlduran on Sat, Jan 24, 12:03 AM.

Details

Reviewers

imp

Commits

rGcd730bef74f9: nanobsd: Use mtree -C to produce the metalog

Summary

Prefer an mtree -C output, which is guaranteed to be mtree-compatible.
Add "gname", "uname", and "tags" to the default keyword set, while
removing "size" and "time", the latter being set on kernel file entries
and taking precedence over makefs -T (when paired with -F).

As a side effect, this produces a cleaner file with sorted keywords.

Test Plan

# sh nanobsd.sh -U -n -c ~/nano.conf
...
# shasum /usr/obj/nanobsd.full/_.disk.image
<matching hash>  /usr/obj/nanobsd.full/_.disk.image
# sh nanobsd.sh -U -n -c ~/nano.conf
...
# shasum /usr/obj/nanobsd.full/_.disk.image
<matching hash>  /usr/obj/nanobsd.full/_.disk.image

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 70101
Build 66984: arc lint + arc unit

Event Timeline

jlduran created this revision.Sat, Jan 24, 12:03 AM

Herald added a subscriber: imp. · View Herald TranscriptSat, Jan 24, 12:03 AM

jlduran requested review of this revision.Sat, Jan 24, 12:03 AM

Harbormaster completed remote builds in B70099: Diff 170312.Sat, Jan 24, 12:03 AM

jlduran edited the test plan for this revision. (Show Details)Sat, Jan 24, 12:10 AM

jlduran added a reviewer: imp.

Update the comment to indicate that we also remove the time keyword

Harbormaster completed remote builds in B70101: Diff 170314.Sat, Jan 24, 12:53 AM

imp accepted this revision.Sat, Jan 24, 12:57 AM

imp added inline comments.

tools/tools/nanobsd/defaults.sh
569	Do you want -u on the sort?

This revision is now accepted and ready to land.Sat, Jan 24, 12:57 AM

jlduran added inline comments.Sat, Jan 24, 1:41 AM

tools/tools/nanobsd/defaults.sh
569	I guess it does not hurt to have it. `mtree-dedup.awk` should take care of duplicates, furthermore `mtree -C` removes the duplicate entries. But I'll add it when committing, just in case. Thanks!