mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-06 06:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

More os-version-specific startosinstall tweaking

Browse Source
This commit is contained in:
Greg Neagle
2018-08-07 16:30:49 -07:00
parent 9c1fb0f206
commit e93b6a881c
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/client/munkilib/osinstaller.py
View File

@@ -263,8 +263,20 @@ class StartOSInstallRunner(object):
cmd.extend([startosinstall_path,
'--agreetolicense',
'--rebootdelay', '300',
'--pidtosignal', str(os.getpid()),
'--nointeraction'])
'--pidtosignal', str(os.getpid())])
if pkgutils.MunkiLooseVersion(
os_version) < pkgutils.MunkiLooseVersion('10.12.4'):
# --volume option is _required_ prior to 10.12.4 installer
# and must _not_ be included in 10.12.4+ installer's startosinstall
cmd.extend(['--volume', '/'])
if pkgutils.MunkiLooseVersion(
os_version) < pkgutils.MunkiLooseVersion('10.13.5'):
# --nointeraction is an undocumented option that appears to be
# not only no longer needed/useful but seems to trigger some issues
# in more recent releases
cmd.extend(['--nointeraction'])
if pkgutils.MunkiLooseVersion(
os_version) < pkgutils.MunkiLooseVersion('10.14'):
@@ -278,12 +290,6 @@ class StartOSInstallRunner(object):
'additional_startosinstall_options' in self.installinfo):
cmd.extend(self.installinfo['additional_startosinstall_options'])
if pkgutils.MunkiLooseVersion(
os_version) < pkgutils.MunkiLooseVersion('10.12.4'):
# --volume option is _required_ prior to 10.12.4 installer
# and must _not_ be included in 10.12.4+ installer's startosinstall
cmd.extend(['--volume', '/'])
# more magic to get startosinstall to not buffer its output for
# percent complete
env = {'NSUnbufferedIO': 'YES'}