mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 04:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moving secure plist (r773) to Apple provided location: /private/var/root/Library/Preferences/

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@776 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Justin McWilliams
2010-10-05 14:42:05 +00:00
parent ad3b1275a2
commit 4a86af1770
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/munkicommon.py
+5 -7
View File
@@ -40,8 +40,8 @@ import FoundationPlist
MANAGED_INSTALLS_PLIST_PATH = '/Library/Preferences/ManagedInstalls.plist'
MANAGED_INSTALLS_PLIST_PATH_NO_EXT = '/Library/Preferences/ManagedInstalls'
# Relative path of secure config plist file to root of ManagedInstallDir.
SECURE_CONFIG_PLIST_REL_PATH = 'Secure/SecureConfig.plist'
SECURE_MANAGED_INSTALLS_PLIST_PATH = (
'/private/var/root/Library/Preferences/ManagedInstalls.plist')
ADDITIONAL_HTTP_HEADERS_KEY = 'AdditionalHttpHeaders'
@@ -587,11 +587,9 @@ def prefs(force_refresh=False):
del _prefs['LastNotifiedDate']
FoundationPlist.writePlist(_prefs, prefsfile)
# Load configs from SecureConfig.plist file; overwrite existing configs
secure_config_file_path = os.path.join(
_prefs['ManagedInstallDir'], SECURE_CONFIG_PLIST_REL_PATH)
if loadPrefsFromFile(_prefs, secure_config_file_path):
_prefs['SecureConfigFile'] = secure_config_file_path
# Load configs from secure ManagedInstalls.plist file.
# Note: this overwrites existing configs.
loadPrefsFromFile(_prefs, SECURE_MANAGED_INSTALLS_PLIST_PATH)
return _prefs