diff options
| author | sjg <sjg@FreeBSD.org> | 2014-05-02 00:45:30 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-05-02 00:45:30 +0000 |
| commit | 035dac0445f8b533a641d0c0e67469d93df434d5 (patch) | |
| tree | 210d9d04bb68671dbd501ee98508a413701ef074 /etc | |
| parent | 5e568154a01fb6be74908baed265f265a56f002f (diff) | |
| download | FreeBSD-src-035dac0445f8b533a641d0c0e67469d93df434d5.zip FreeBSD-src-035dac0445f8b533a641d0c0e67469d93df434d5.tar.gz | |
There is no guarantee that our group has a name.
Since the results are temp, just subst [gu]name for [gu]id
Reviewed by: obrien
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index 0909b8b..340ade4 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 |
