summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2014-05-02 00:45:30 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2014-05-02 00:45:30 +0000
commit63efcf90b98b3913c0e608f5ff82697dc901b34f (patch)
tree210d9d04bb68671dbd501ee98508a413701ef074 /etc
parent3b8f08459569bf0faa21473e5cec2491e95c9349 (diff)
downloadsrc-test2-63efcf90b98b3913c0e608f5ff82697dc901b34f.tar.gz
src-test2-63efcf90b98b3913c0e608f5ff82697dc901b34f.zip
Notes
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 0909b8bfbd58..340ade4dc2a0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -319,10 +319,11 @@ distribution:
MTREE_CMD?= mtree
.if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0
-MTREE_FILTER= sed -e 's,\(uname=\)[^ ]* ,\1${BINOWN} ,' \
- -e 's,\(gname=\)[^ ]* ,\1${BINGRP} ,' \
+MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
- -e 's,\(gid=\)[^ ]* ,\1${_gid} ,'
+ -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
+ -e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
+ -e 's,\(gid=\)[^ ]*$$,\1${_gid},'
.else
MTREE_FILTER= cat
.endif