Changeset 81415

Timestamp:

07/29/11 22:50:18 (4 years ago)

Author:

jmr@…

Message:

also avoid uid collision in postflight script, and use DSCL variable in Makefile

Location:

trunk/base

Files:

• Makefile.in (modified) (1 diff)
• portmgr/dmg/postflight (modified) (1 diff)

trunk/base/Makefile.in

@@ -52 +52 @@
                 echo "Creating user \"${RUNUSR}\"" ; \
                 NEXTUID=501; \
-                while test -n "`dscl -q /Search -search /Users UniqueID $$NEXTUID`"; do \
+                while test -n "`${DSCL} -q /Search -search /Users UniqueID $$NEXTUID`"; do \
                     let "NEXTUID=NEXTUID+1"; \
                 done; \

trunk/base/portmgr/dmg/postflight

@@ -143 +143 @@
     if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then
         echo "Creating user \"${RUNUSR}\""
+        NEXTUID=501
+        while [[ -n "`${DSCL} -q /Search -search /Users UniqueID $NEXTUID`" ]]; do
+            let "NEXTUID=NEXTUID+1"
+        done
+        ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $NEXTUID
         ${DSCL} -q . -create /Users/${RUNUSR} Password \*
-        ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $(($(${DSCL} . -list /Users UniqueID | /usr/bin/awk '{print $2}' | sort -ug | tail -1)+1))
         ${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