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

munkicommon.py/mountdmg() now has an option to mount dmgs with shadow files to allow read-write access to read-ony disk images.

Browse Source 
installer.py now mounts disk images with -shadow option to enable the next change - 
For bundle-style packages, installer.py/install() now attempts to remove any bundle relocation info to disable installer's bundle relocator. This should force items to install to their default locations.

git-svn-id: http://munki.googlecode.com/svn/trunk@434 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-02-03 18:14:16 +00:00
parent d895a4c106
commit 01180408a9
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/installer.py
+33 -3
View File
@@ -38,6 +38,29 @@ from removepackages import removepackages
munkicommon.report['InstallResults'] = []
munkicommon.report['RemovalResults'] = []
def removeBundleRelocationInfo(pkgpath):
'''Attempts to remove any info in the package
that would cause bundle relocation behavior.
This makes bundles install or update in their
default location.'''
if os.path.isdir(pkgpath):
# remove relocatable stuff
tokendefinitions = os.path.join(pkgpath,
"Contents/Resources/TokenDefinitions.plist")
if os.path.exists(tokendefinitions):
try:
os.remove(tokendefinitions)
except:
pass
infoplist = os.path.join(pkgpath, "Contents/Info.plist")
pl = FoundationPlist.readPlist(infoplist)
if 'IFPkgPathMappings' in pl:
del pl['IFPkgPathMappings']
try:
FoundationPlist.writePlist(pl, infoplist)
except:
pass
def install(pkgpath, choicesXMLpath=None):
"""
@@ -52,6 +75,8 @@ def install(pkgpath, choicesXMLpath=None):
if os.path.islink(pkgpath):
# resolve links before passing them to /usr/bin/installer
pkgpath = os.path.realpath(pkgpath)
removeBundleRelocationInfo(pkgpath)
packagename = ''
restartaction = 'None'
@@ -174,7 +199,7 @@ def installall(dirpath, choicesXMLpath=None):
itempath = os.path.join(dirpath, item)
if item.endswith(".dmg"):
munkicommon.display_info("Mounting disk image %s" % item)
mountpoints = munkicommon.mountdmg(itempath)
mountpoints = munkicommon.mountdmg(itempath, use_shadow=True)
if mountpoints == []:
munkicommon.display_error("No filesystems mounted from %s" %
item)
@@ -414,9 +439,14 @@ def installWithInfo(dirpath, installlist):
if not foundagain:
# now remove the item from the install cache
# (using rm -rf in case it's a bundle pkg)
itempath = os.path.join(dirpath, current_installer_item)
retcode = subprocess.call(["/bin/rm", "-rf", itempath])
if os.path.isdir(itempath):
retcode = subprocess.call(["/bin/rm", "-rf", itempath])
else:
retcode = subprocess.call(["/bin/rm", itempath])
shadowfile = os.path.join(itempath,".shadow")
if os.path.exists(shadowfile):
retcode = subprocess.call(["/bin/rm" shadowfile])
return restartflag
code/client/munkilib/munkicommon.py
+7 -3
View File
@@ -385,15 +385,19 @@ def osascript(osastring):
# dmg helpers
def mountdmg(dmgpath):
def mountdmg(dmgpath, use_shadow=False):
"""
Attempts to mount the dmg at dmgpath
and returns a list of mountpoints
If use_shadow is true, mount image with shadow file
"""
mountpoints = []
dmgname = os.path.basename(dmgpath)
p = subprocess.Popen(['/usr/bin/hdiutil', 'attach', dmgpath,
'-mountRandom', '/tmp', '-nobrowse', '-plist'],
cmd = ['/usr/bin/hdiutil', 'attach', dmgpath,
'-mountRandom', '/tmp', '-nobrowse', '-plist']
if use_shadow:
cmd.append('-shadow')
p = subprocess.Popen(cmd,
bufsize=1, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(plist, err) = p.communicate()