Skip to content
Permalink
Browse files

Don't use --applicationpath option for startosinstall for later relea…

…ses of High Sierra and for Mojave. Bump version for future release.
  • Loading branch information...
gregneagle committed Sep 25, 2018
1 parent 97d704c commit 7b6822f9c6c3a0b707879fe06e5eb399f2566ba5
Showing with 11 additions and 5 deletions.
  1. +10 −4 code/client/munkilib/osinstaller.py
  2. +1 −1 code/client/munkilib/version.plist
@@ -262,21 +262,27 @@ def start(self):

cmd.extend([startosinstall_path,
'--agreetolicense',
'--applicationpath', app_path,
'--rebootdelay', '300',
'--pidtosignal', str(os.getpid()),
'--nointeraction'])

if (self.installinfo and
'additional_startosinstall_options' in self.installinfo):
cmd.extend(self.installinfo['additional_startosinstall_options'])
if pkgutils.MunkiLooseVersion(
os_version) < pkgutils.MunkiLooseVersion('10.13.6'):
# --applicationpath option is _required_ in Sierra and early
# releases of High Sierra. It became optional (or is ignored) in
# later releases of High Sierra and causes warnings in Mojave
cmd.extend(['--applicationpath', app_path])

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 (self.installinfo and
'additional_startosinstall_options' in self.installinfo):
cmd.extend(self.installinfo['additional_startosinstall_options'])

# more magic to get startosinstall to not buffer its output for
# percent complete
env = {'NSUnbufferedIO': 'YES'}
@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>CFBundleShortVersionString</key>
<string>3.4.1</string>
<string>3.4.2</string>
</dict>
</plist>

0 comments on commit 7b6822f

Please sign in to comment.
You can’t perform that action at this time.