Author: imp
Date: Mon Dec 7 04:02:34 2015
New Revision: 291915
URL: https://svnweb.freebsd.org/changeset/base/291915
Log:
imported patch dedup
Modified:
head/tools/tools/nanobsd/mtree-dedup.awk (contents, props changed)
Modified: head/tools/tools/nanobsd/mtree-dedup.awk
==============================================================================
--- head/tools/tools/nanobsd/mtree-dedup.awk Mon Dec 7 04:02:32 2015
(r291914)
+++ head/tools/tools/nanobsd/mtree-dedup.awk Mon Dec 7 04:02:34 2015
(r291915)
@@ -178,6 +178,8 @@ BEGIN {
nv = "___NO__VALUE___";
while ((getline < "/dev/stdin") > 0) {
+ if ($1 ~ "^#")
+ continue;
if ($1 == "/set") {
for (i = 2; i <= NF; i++) {
kv($i);
@@ -192,6 +194,9 @@ BEGIN {
process_line($1, $0);
}
+ # Print the last set of defaults. This will carry
+ # over, I think, to makefs' defaults
+ print mtree_from_kvs("/set", defaults)
for (x in tree)
print tree[x];
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
