summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2016-01-08 00:05:47 +0000
committerimp <imp@FreeBSD.org>2016-01-08 00:05:47 +0000
commit4f30c1fb307d367f8f223d9b53f276eda15e4ac1 (patch)
tree9dad6dac86b1e3b1d6a13ce3ed26e0449783cebd /tools
parent1beafb16d5ead967d0523ebd068ffa6a16414ce4 (diff)
downloadFreeBSD-src-4f30c1fb307d367f8f223d9b53f276eda15e4ac1.zip
FreeBSD-src-4f30c1fb307d367f8f223d9b53f276eda15e4ac1.tar.gz
Make sure that the /set directive gets put at the top of the file,
instead of in sort order. Slash sorts after period.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tools/nanobsd/defaults.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 9bc1779..3534ba2 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -500,10 +500,9 @@ fixup_before_diskimage ( ) (
if [ -n "${NANO_METALOG}" ]; then
pprint 2 "Fixing metalog"
cp ${NANO_METALOG} ${NANO_METALOG}.pre
- (echo "/set uname=${NANO_DEF_UNAME} gname=${NANO_DEF_GNAME}" &&
- cat ${NANO_METALOG}.pre) | \
- ${NANO_TOOLS}/mtree-dedup.awk | \
- sed -e 's/ size=[0-9][0-9]*//' | sort > ${NANO_METALOG}
+ echo "/set uname=${NANO_DEF_UNAME} gname=${NANO_DEF_GNAME}" > ${NANO_METALOG}
+ cat ${NANO_METALOG}.pre | ${NANO_TOOLS}/mtree-dedup.awk | \
+ sed -e 's/ size=[0-9][0-9]*//' | sort >> ${NANO_METALOG}
fi
)
OpenPOWER on IntegriCloud