From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 24 Oct 2018 15:08:44 +0000 (+0200)
Subject: Removing rhgb from Grub command line
X-Git-Tag: 0.3.2^2~26
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=a5bd182e5b189d3bdeebdd4fffb5bc85388fe7e6;p=pixelpark%2Fcreate-vmware-tpl.git

Removing rhgb from Grub command line
---

diff --git a/bin/postinst b/bin/postinst
index 57b21db..86bc1c5 100644
--- 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 b73bc05..ed43a79 100644
--- 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 1241c97..22971db 160000
--- a/python_fb_tools
+++ b/python_fb_tools
@@ -1 +1 @@
-Subproject commit 1241c9751b81c690aec9e33401cffc7cf2fc4946
+Subproject commit 22971db392688efea927ec67aca0eb6fe240e886