From 6a91a3ba6b1c6d792e037c174494b0d84de76147 Mon Sep 17 00:00:00 2001
From: Yuming Zhu <yzhu@redhat.com>
Date: May 03 2018 19:00:34 +0000
Subject: change default value of oz_install_timeout to 0


---

diff --git a/builder/kojid b/builder/kojid
index c4b6f24..c214863 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3563,7 +3563,7 @@ class OzImageTask(BaseTaskHandler):
             'imgdir': os.path.join(self.workdir, 'scratch_images'),
             'tmpdir': os.path.join(self.workdir, 'oz-tmp'),
             'verbose': True,
-            'timeout': self.options.oz_install_timeout,
+            'timeout': self.options.oz_install_timeout or None,
             'output': 'log',
             'raw': False,
             'debug': True,
@@ -5725,7 +5725,7 @@ def get_options():
                                      'resolver-status.properties *.lastUpdated',
                 'failed_buildroot_lifetime' : 3600 * 4,
                 'rpmbuild_timeout' : 3600 * 24,
-                'oz_install_timeout': None,
+                'oz_install_timeout': 0,
                 'cert': None,
                 'ca': '',  # FIXME: Unused, remove in next major release
                 'serverca': None}
diff --git a/builder/kojid.conf b/builder/kojid.conf
index 8178f4a..7bc235d 100644
--- a/builder/kojid.conf
+++ b/builder/kojid.conf
@@ -39,7 +39,8 @@
 ; rpmbuild_timeout=86400
 
 ; Install timeout(seconds) for image build
-; if it's unset, use the number in /etc/oz/oz.cfg, supported since oz-0.16.0
+; Default value is 0, which means using the number in /etc/oz/oz.cfg,
+; supported since oz-0.16.0
 ; oz_install_timeout=7200
 
 ; The URL for the xmlrpc server
diff --git a/docs/source/image_build.rst b/docs/source/image_build.rst
index f7d8ef2..b44db39 100644
--- a/docs/source/image_build.rst
+++ b/docs/source/image_build.rst
@@ -661,9 +661,9 @@ ImageFactory/Oz Preparation
     #.  VMDKStream => 0.2
     #.  pykickstart
 #.  Edit ``/etc/kojid/kojid.conf``, and set an second value, eg: 7200 for
-    ``oz_install_timeout``. It's a timeout waiting guest installing. If it's
-    not specified, oz will use its default value. Since ``oz-0.16.0`` it can be
-    configured in ``/etc/oz/oz.cfg`` as ``install`` in the ``[timeouts]``
+    ``oz_install_timeout``. It's a timeout waiting guest installing. Default
+    value is 0, that means oz will use its default value. Since ``oz-0.16.0``,
+    it can be configured in ``/etc/oz/oz.cfg`` as ``install`` in ``[timeouts]``
     section.
 #.  Edit ``/etc/oz/oz.cfg``, and set the memory value in the ``[libvirt]``
     section to at least 2048. Set ``safe_generation`` under ``[icicle]`` to yes.