Removing rhgb from Grub command line

diff --git a/bin/postinst b/bin/postinst
index 57b21dbcec142c5915d808392b696b8c2e357197..86bc1c5de5e6f07ff422fc72b2a98895824b9f4a 100644 (file)
--- a/bin/postinst
+++ b/bin/postinst
@@ -303,6 +303,9 @@ tweak_grub() {
         echo "Removing quiet from '${grub_cfg}' ..."
         sed --in-place -e 's/^\(GRUB_CMDLINE_LINUX=.*\)[       ]quiet\(.*\)/\1\2/' "${grub_cfg}"
 
+        echo "Removing rhgb (RedHat Graphical Boot) from '${grub_cfg}' ..."
+        sed --in-place -e 's/^\(GRUB_CMDLINE_LINUX=.*\)[       ]rhgb\(.*\)/\1\2/' "${grub_cfg}"
+
         echo "Recreating /boot/grub2/grub.cfg ..."
         grub2-mkconfig -o /boot/grub2/grub.cfg
 

diff --git a/lib/cr_vmware_tpl/handler.py b/lib/cr_vmware_tpl/handler.py
index b73bc057dedac026216beaca17a5fe33e7df6557..ed43a79b02ba4c28106f09c43ab99f440f44b9cb 100644 (file)
--- a/lib/cr_vmware_tpl/handler.py
+++ b/lib/cr_vmware_tpl/handler.py
@@ -583,7 +583,7 @@ class CrTplHandler(BaseHandler):
         LOG.debug("Start Creating VM ...")
         task = tpl_vm_folder.CreateVM_Task(config=config, pool=self.cluster.resource_pool)
 
-        self.wait_for_tasks([task])
+        self.vsphere.wait_for_tasks([task], poll_time=0.2)
 
     # -------------------------------------------------------------------------
     def poweron_vm(self):

diff --git a/python_fb_tools b/python_fb_tools
index 1241c9751b81c690aec9e33401cffc7cf2fc4946..22971db392688efea927ec67aca0eb6fe240e886 160000 (submodule)
--- a/python_fb_tools
+++ b/python_fb_tools
@@ -1 +1 @@
-Subproject commit 1241c9751b81c690aec9e33401cffc7cf2fc4946
+Subproject commit 22971db392688efea927ec67aca0eb6fe240e886