diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2016-06-23 19:19:44 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2016-06-23 19:19:44 +0000 |
| commit | 948c30e565f327b0a0369d0146f3445a4844fda0 (patch) | |
| tree | 516d541c7284fdf564c2f66193afd5a0fcf51dd5 /tools/tools/makeroot/makeroot.sh | |
| parent | 5fafcca757452b352b4ca3ad23e1f0af2f9f8a84 (diff) | |
| download | src-948c30e565f327b0a0369d0146f3445a4844fda0.tar.gz src-948c30e565f327b0a0369d0146f3445a4844fda0.zip | |
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
Notes
Notes:
svn path=/head/; revision=302146
Diffstat (limited to 'tools/tools/makeroot/makeroot.sh')
| -rwxr-xr-x | tools/tools/makeroot/makeroot.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/tools/makeroot/makeroot.sh b/tools/tools/makeroot/makeroot.sh index a1e669766bf0..c4fa1bb1648b 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} |