svn commit: r302146 - head/tools/tools/makeroot

[Ed Maste]

Author: emaste
Date: Thu Jun 23 19:19:44 2016
New Revision: 302146
URL: https://svnweb.freebsd.org/changeset/base/302146

Log:
  makeroot: zero out subsecond component of time= keywords
  
  They are currently not supported by makefs(1).
  
  PR:		194703
  Reviewed by:	brooks
  Approved by:	re (gjb)
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D6925

Modified:
  head/tools/tools/makeroot/makeroot.sh

Modified: head/tools/tools/makeroot/makeroot.sh
==============================================================================
--- head/tools/tools/makeroot/makeroot.sh	Thu Jun 23 18:04:48 2016	(r302145)
+++ head/tools/tools/makeroot/makeroot.sh	Thu Jun 23 19:19:44 2016	(r302146)
@@ -238,5 +238,9 @@ if [ -n "${SIZE}" ]; then
 SIZEFLAG="-s ${SIZE}"
 fi
 
+# Zero out subsecond component of time= keywords as they are currently not
+# supported by makefs
+sed -i '' -E 's/(time=[0-9]*)\.[0-9]*/\1.0/' ${manifest}
+
 cd ${BSDROOT}; makefs ${DUPFLAG} -N ${DBDIR} ${SIZEFLAG} ${BFLAG} \
      -t ffs ${LABELFLAG} -f 256 ${IMGFILE} ${manifest}