Author: imp
Date: Fri Jan  8 00:05:47 2016
New Revision: 293399
URL: https://svnweb.freebsd.org/changeset/base/293399

Log:
  Make sure that the /set directive gets put at the top of the file,
  instead of in sort order. Slash sorts after period.

Modified:
  head/tools/tools/nanobsd/defaults.sh   (contents, props changed)

Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh        Fri Jan  8 00:05:28 2016        
(r293398)
+++ head/tools/tools/nanobsd/defaults.sh        Fri Jan  8 00:05:47 2016        
(r293399)
@@ -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      
 )
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to