diff --git a/builder/kojid b/builder/kojid index e94f6379..8217f3e6 100755 --- a/builder/kojid +++ b/builder/kojid @@ -733,7 +733,7 @@ class BuildRoot(object): # mock 1.4+ /tmp is tmpfs mounted on each run, different # directory is needed for persistency # 'within' is equivalent to broot.path_without_to_within(broot.tmpdir()) - base = "/builddir/tmp" + base = self.options.tmpdir if within: return base else: @@ -5579,6 +5579,7 @@ def get_options(): parser.add_option("--topdir", help="Specify topdir") parser.add_option("--topurl", help="Specify topurl") parser.add_option("--workdir", help="Specify workdir") + parser.add_option("--tmpdir", help="Specify tmpdir") parser.add_option("--pluginpath", help="Specify plugin search path") parser.add_option("--plugin", action="append", help="Load specified plugin") parser.add_option("--mockdir", help="Specify mockdir") @@ -5607,6 +5608,7 @@ def get_options(): 'topdir': '/mnt/koji', 'topurl': None, 'workdir': '/var/tmp/koji', + 'tmpdir': '/tmpdir', 'pluginpath': '/usr/lib/koji-builder-plugins', 'mockdir': '/var/lib/mock', 'mockuser': 'kojibuilder', diff --git a/builder/kojid.conf b/builder/kojid.conf index 3d2f3ce3..08d071a2 100644 --- a/builder/kojid.conf +++ b/builder/kojid.conf @@ -14,6 +14,9 @@ ; The directory root for temporary storage ; workdir=/tmp/koji +; The temporary directory in buildroot +; tmpdir = /tmpdir + ; The directory root for mock ; mockdir=/var/lib/mock