mirror of
https://github.com/munki/munki.git
synced 2026-04-22 04:28:21 -05:00
If we are about to do an install at the loginwindow, check to see if FileSyncAgent.app is running. This might be HomeSync running during a login process. If so, don't install.
This commit is contained in:
@@ -268,11 +268,7 @@ def doRestart():
|
||||
else:
|
||||
munkicommon.display_info(restartMessage)
|
||||
|
||||
# TODO: temporary fix for forced logout problem where we've killed
|
||||
# loginwindow sessions, but munkicommon.currentGUIusers() still returns
|
||||
# users. Need to find a better solution, though.
|
||||
#if not munkicommon.currentGUIusers():
|
||||
# # no-one is logged in and we're at the loginwindow
|
||||
# check current console user
|
||||
consoleuser = munkicommon.getconsoleuser()
|
||||
if not consoleuser or consoleuser == u'loginwindow':
|
||||
# no-one is logged in or we're at the loginwindow
|
||||
@@ -502,7 +498,7 @@ def main():
|
||||
# network interfaces to come up
|
||||
# before continuing
|
||||
munkicommon.display_status_minor('Waiting for network...')
|
||||
for i in range(5):
|
||||
for unused_i in range(5):
|
||||
if networkUp():
|
||||
break
|
||||
time.sleep(2)
|
||||
@@ -786,6 +782,11 @@ def main():
|
||||
munkicommon.log('Skipping auto install at loginwindow '
|
||||
'because system is not idle '
|
||||
'(keyboard or mouse activity).')
|
||||
elif munkicommon.isAppRunning(
|
||||
'/System/Library/CoreServices/FileSyncAgent.app'):
|
||||
munkicommon.log('Skipping auto install at loginwindow '
|
||||
'because FileSyncAgent.app is running '
|
||||
'(HomeSyncing a mobile account on login?).')
|
||||
else:
|
||||
# no GUI users, system is idle, so we can install
|
||||
# but first, enable status output over login window
|
||||
|
||||
Reference in New Issue
Block a user