diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-07-21 17:56:22 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-07-21 17:56:22 +0000 |
| commit | d180f7d75198484e14637d96af0ec37ceda51e69 (patch) | |
| tree | 8c8a2117faa09c36bc0f0c2a4f6d1ca233c93260 | |
| parent | b50832e231d58fcbfaae87f92d512cb84ac39687 (diff) | |
| download | FreeBSD-src-d180f7d75198484e14637d96af0ec37ceda51e69.zip FreeBSD-src-d180f7d75198484e14637d96af0ec37ceda51e69.tar.gz | |
MFC r320883:
Fix INSTALL_AS_USER after r319020.
| -rw-r--r-- | etc/Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/etc/Makefile b/etc/Makefile index d3e7c6a..13c7838 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -340,19 +340,6 @@ distribution: MTREE_CMD?= mtree -.if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0 -MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \ - -e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \ - -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \ - -e 's,\(uid=\)[^ ]*$$,\1${_uid},' \ - -e 's,\(gid=\)[^ ]*$$,\1${_gid},' -.else -MTREE_FILTER= cat -.if !defined(NO_FSCHG) -MTREE_FSCHG= -i -.endif -.endif - MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ @@ -468,3 +455,16 @@ etc-examples: etc-examples-install DESTDIR=${DESTDIR}${SHAREDIR}/examples .include <bsd.prog.mk> + +.if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0 +MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \ + -e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \ + -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \ + -e 's,\(uid=\)[^ ]*$$,\1${_uid},' \ + -e 's,\(gid=\)[^ ]*$$,\1${_gid},' +.else +MTREE_FILTER= cat +.if !defined(NO_FSCHG) +MTREE_FSCHG= -i +.endif +.endif |
