Changeset 81466


Ignore:
Timestamp:
Jul 31, 2011, 9:48:12 AM (9 years ago)
Author:
jmr@…
Message:

merge r81454 from trunk:

make group creation tiger compatible, and try to fix invalid PrimaryGroupID for runuser on tiger

Location:
branches/release_2_0
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/release_2_0

  • branches/release_2_0/base

  • branches/release_2_0/base/Makefile.in

    r81416 r81466  
    4343            if test `id -u` -eq 0; then \
    4444                echo "Creating group \"${RUNUSR}\"" ; \
    45                 ${DSEDITGROUP} -q -o create -n . ${RUNUSR} ; \
     45                ${DSEDITGROUP} -q -o create ${RUNUSR} ; \
    4646            else \
    4747                echo "Not creating group \"${RUNUSR}\" (not root)" ; \
     
    6262            else \
    6363                echo "Not creating user \"${RUNUSR}\" (not root)" ; \
     64            fi ; \
     65        fi ; \
     66        if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4; then \
     67            GID=`${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
     68            if test "`${DSCL} -q . -read /Users/${RUNUSR} PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
     69                echo "Fixing PrimaryGroupID for user \"${RUNUSR}\"" ; \
     70                ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$GID ; \
    6471            fi ; \
    6572        fi ; \
  • branches/release_2_0/base/portmgr/dmg/postflight

    r81416 r81466  
    139139    if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then
    140140        echo "Creating group \"${RUNUSR}\""
    141         ${DSEDITGROUP} -q -o create -n . ${RUNUSR}
     141        ${DSEDITGROUP} -q -o create ${RUNUSR}
    142142    fi
    143143    if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then
     
    152152        ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory /var/empty
    153153        ${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false
     154    fi
     155    if [[ $(sw_vers -productVersion | /usr/bin/awk -F . '{print $2}') -eq 4 ]]; then
     156        GID=$(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $2}')
     157        if [[ "$(${DSCL} -q . -read /Users/${RUNUSR} PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $2}')" != "$GID" ]]; then
     158            echo "Fixing PrimaryGroupID for user \"${RUNUSR}\""
     159            ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $GID
     160        fi
    154161    fi
    155162}
  • branches/release_2_0/base/portmgr/fedora/macports.spec

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/release_2_0/base/src/pextlib1.0/sha2.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/release_2_0/base/src/pextlib1.0/sha2.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/release_2_0/base/src/pextlib1.0/sha256cmd.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/release_2_0/base/src/pextlib1.0/sha256cmd.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.