summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-06-23 19:19:44 +0000
committeremaste <emaste@FreeBSD.org>2016-06-23 19:19:44 +0000
commit70d8061f8ef743b1f543c7337d36cbef7fe46ea6 (patch)
tree516d541c7284fdf564c2f66193afd5a0fcf51dd5 /tools
parent9ac5e0548491e54a113c9ba7aa5f83134a64bfeb (diff)
downloadFreeBSD-src-70d8061f8ef743b1f543c7337d36cbef7fe46ea6.zip
FreeBSD-src-70d8061f8ef743b1f543c7337d36cbef7fe46ea6.tar.gz
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tools/makeroot/makeroot.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/tools/makeroot/makeroot.sh b/tools/tools/makeroot/makeroot.sh
index a1e6697..c4fa1bb 100755
--- a/tools/tools/makeroot/makeroot.sh
+++ b/tools/tools/makeroot/makeroot.sh
@@ -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}
OpenPOWER on IntegriCloud