vbox_guest module: not upgrade OS by default (can be unexpected)

saltstack · Nov 18, 2014 · 382896f · 382896f
1 parent f31cd73
commit 382896f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/salt/modules/vbox_guest.py b/salt/modules/vbox_guest.py
@@ -120,7 +120,7 @@ def _additions_install_fedora(**kwargs):
 def _additions_install_linux(mount_point, **kwargs):
     reboot = kwargs.pop('reboot', False)
     restart_x11 = kwargs.pop('restart_x11', False)
-    upgrade_os = kwargs.pop('upgrade_os', True)
+    upgrade_os = kwargs.pop('upgrade_os', False)
     if upgrade_os:
         __salt__['pkg.upgrade']()
     # dangerous: do not call variable `os` as it will hide os module
@@ -171,7 +171,7 @@ def additions_install(**kwargs):
 
         salt '*' vbox_guest.additions_install
         salt '*' vbox_guest.additions_install reboot=True
-        salt '*' vbox_guest.additions_install upgrade_os=False
+        salt '*' vbox_guest.additions_install upgrade_os=True
 
     :param reboot: reboot computer to complete installation
     :type reboot: bool

diff --git a/salt/states/vbox_guest.py b/salt/states/vbox_guest.py
@@ -10,7 +10,7 @@
 log = logging.getLogger(__name__)
 
 
-def additions_installed(name, reboot=False, upgrade_os=True):
+def additions_installed(name, reboot=False, upgrade_os=False):
     '''
     Ensure that the VirtualBox Guest Additions are installed. Uses the CD,
     connected by VirtualBox.
@@ -20,7 +20,7 @@ def additions_installed(name, reboot=False, upgrade_os=True):
         reference.
     reboot : False
         Restart OS to complete installation.
-    upgrade_os : True
+    upgrade_os : False
         Upgrade OS (to ensure the latests version of kernel and developer tools
         installed).
     '''