Change so SuppressAutoInstall will not suppress a checkandinstallatstartup run.

git-svn-id: http://munki.googlecode.com/svn/trunk@610 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2026-04-29 00:39:42 -05:00 · 2010-07-27 23:18:52 +00:00
parent f020f400f1
commit fe1b86e46a
1 changed files with 2 additions and 1 deletions
@@ -555,7 +555,8 @@ def main():
            if not munkicommon.currentGUIusers():
                # no GUI users
                if getIdleSeconds() > 10:
-                    if not munkicommon.pref('SuppressAutoInstall'):
+                    if not munkicommon.pref('SuppressAutoInstall') or \
+                                        runtype == "checkandinstallatstartup":
                        # no GUI users, system is idle, so install
                        mustrestart = doInstallTasks()
                    else: