Moved /private/etc/paths.d/munki file from munki_core to munki_admin pkg.

This commit is contained in:
Greg Neagle
2011-09-16 10:50:23 -07:00
parent 284fa8ab52
commit e999eea016
+5 -5
View File
@@ -317,10 +317,6 @@ cp -X "$MUNKIROOT/code/client/munkilib/version.plist" "$COREROOT/usr/local/munki
if [ "$SVNREV" -lt "1302" ]; then
echo $SVNREV > "$COREROOT/usr/local/munki/munkilib/svnversion"
fi
# make paths.d file
mkdir -p "$COREROOT/private/etc/paths.d"
echo "/usr/local/munki" > "$COREROOT/private/etc/paths.d/munki"
chmod -R 755 "$COREROOT/private"
# add Build Number and Git Revision to version.plist
/usr/libexec/PlistBuddy -c "Delete :BuildNumber" "$COREROOT/usr/local/munki/munkilib/version.plist" 2>/dev/null
@@ -367,6 +363,10 @@ done
# Set permissions.
chmod -R go-w "$ADMINROOT/usr/local/munki"
chmod +x "$ADMINROOT/usr/local/munki"
# make paths.d file
mkdir -p "$ADMINROOT/private/etc/paths.d"
echo "/usr/local/munki" > "$ADMINROOT/private/etc/paths.d/munki"
chmod -R 755 "$ADMINROOT/private"
# Create package info file.
ADMINSIZE=`du -sk $ADMINROOT | cut -f1`
@@ -530,9 +530,9 @@ echo "Setting ownership to root..."
sudo chown root:admin "$COREROOT" "$ADMINROOT" "$APPROOT" "$LAUNCHDROOT"
sudo chown -hR root:wheel "$COREROOT/usr"
sudo chown -hR root:admin "$COREROOT/Library"
sudo chown -hR root:wheel "$COREROOT/private"
sudo chown -hR root:wheel "$ADMINROOT/usr"
sudo chown -hR root:wheel "$ADMINROOT/private"
sudo chown -hR root:admin "$APPROOT/Applications"