[90011] branches/release_2_0
jmr at macports.org
jmr at macports.org
Sun Feb 19 10:24:32 PST 2012
Revision: 90011
http://trac.macports.org/changeset/90011
Author: jmr at macports.org
Date: 2012-02-19 10:24:30 -0800 (Sun, 19 Feb 2012)
Log Message:
-----------
merge r89988, r89993, r90002, r90010 from trunk:
Change Home directory for MacPorts user to be ${prefix}/var/macports/home
Revision Links:
--------------
http://trac.macports.org/changeset/89988
http://trac.macports.org/changeset/89993
http://trac.macports.org/changeset/90002
http://trac.macports.org/changeset/90010
Modified Paths:
--------------
branches/release_2_0/base/Makefile.in
branches/release_2_0/base/doc/base.mtree.in
branches/release_2_0/base/portmgr/dmg/postflight
Property Changed:
----------------
branches/release_2_0/
branches/release_2_0/base/
Property changes on: branches/release_2_0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045
+ /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993,90002,90010
Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,89988,89993,90002,90010
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_0/base/Makefile.in
===================================================================
--- branches/release_2_0/base/Makefile.in 2012-02-19 18:17:23 UTC (rev 90010)
+++ branches/release_2_0/base/Makefile.in 2012-02-19 18:24:30 UTC (rev 90011)
@@ -64,12 +64,20 @@
${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
${DSCL} -q . -create /Users/${RUNUSR} Password \* ; \
${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \
- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory /var/empty ; \
+ ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${localstatedir}/macports/home ; \
${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false ; \
else \
echo "Not creating user \"${RUNUSR}\" (not root)" ; \
fi ; \
fi ; \
+ if test "$$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
+ if test `id -u` -eq 0; then \
+ echo "Updating home directory location for user \"${RUNUSR}\"" ; \
+ ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${localstatedir}/macports/home ; \
+ else \
+ echo "Not updating home directory location for user \"${RUNUSR}\" (not root)" ; \
+ fi ; \
+ fi ; \
if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4 -a `id -u` -eq 0; then \
GID=`${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
if test "`${DSCL} -q . -read /Users/${RUNUSR} PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
Modified: branches/release_2_0/base/doc/base.mtree.in
===================================================================
--- branches/release_2_0/base/doc/base.mtree.in 2012-02-19 18:17:23 UTC (rev 90010)
+++ branches/release_2_0/base/doc/base.mtree.in 2012-02-19 18:24:30 UTC (rev 90011)
@@ -11,6 +11,12 @@
..
distfiles
..
+ home
+ Library
+ Preferences
+ ..
+ ..
+ ..
logs
..
registry
Modified: branches/release_2_0/base/portmgr/dmg/postflight
===================================================================
--- branches/release_2_0/base/portmgr/dmg/postflight 2012-02-19 18:17:23 UTC (rev 90010)
+++ branches/release_2_0/base/portmgr/dmg/postflight 2012-02-19 18:24:30 UTC (rev 90011)
@@ -165,7 +165,7 @@
${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts
${DSCL} -q . -create /Users/${RUNUSR} Password \*
${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $2}')
- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory /var/empty
+ ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${PREFIX}/var/macports/home
${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false
fi
if [[ $(sw_vers -productVersion | /usr/bin/awk -F . '{print $2}') -eq 4 ]]; then
@@ -176,6 +176,10 @@
${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts
fi
fi
+ if [[ "$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ]]; then
+ echo "Updating home directory location for user \"${RUNUSR}\""
+ ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${PREFIX}/var/macports/home
+ fi
}
echo "The MacPorts Project, postflight script version ${VERSION}: checking the shell environment for user \"${USER}\"."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120219/ff2e8fc8/attachment-0001.html>
More information about the macports-changes
mailing list