mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-22 20:48:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'lfronius/master'

Browse Source
This commit is contained in:
Greg Neagle
2011-09-09 09:04:35 -07:00
parent 116569f4fd e45f31fe07
commit cb3d75eb45
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/manifestutil
+10 -2
View File
@@ -202,9 +202,17 @@ def mountRepoCLI():
repo_url = pref('repo_url')
if os.path.exists(repo_path):
return
os.mkdir(repo_path, 0777)
os.mkdir(repo_path)
print 'Attempting to mount fileshare %s:' % repo_url
cmd = ['/sbin/mount_afp', '-i', repo_url, repo_path]
if repo_url.startswith('afp:'):
cmd = ['/sbin/mount_afp', '-i', repo_url, repo_path]
elif repo_url.startswith('smb:'):
cmd = ['/sbin/mount_smbfs', repo_url[4:], repo_path]
elif repo_url.startswith('nfs:'):
cmd = ['/sbin/mount_nfs', repo_url, repo_path]
else:
print >> sys.stderr, 'Unsupported filesystem URL!'
return
retcode = subprocess.call(cmd)
if retcode:
os.rmdir(repo_path)
code/client/munkiimport
+2
View File
@@ -111,6 +111,8 @@ def mountRepoCLI():
cmd = ['/sbin/mount_afp', '-i', repo_url, repo_path]
elif repo_url.startswith('smb:'):
cmd = ['/sbin/mount_smbfs', repo_url[4:], repo_path]
elif repo_url.startswith('nfs:'):
cmd = ['/sbin/mount_nfs', repo_url, repo_path]
else:
print >> sys.stderr, 'Unsupported filesystem URL!'
return