From 0943eb615e3def4212553e820a94df47a597b7e3 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Wed, 04 Jul 2012 17:15:40 +0000 Subject: base: use builddir as imgcreate temporary directory (#11988) imgcreate now uses /tmp as its temporary store, moved from /var/tmp. This complicates things when building on XO, and goes against the currently documented instructions. Use the build directory for storing this, which resides within /var/tmp for systemwide installs, and resides within build/ for developer checkouts. --- diff --git a/modules/base/build.40.imagecreate.py b/modules/base/build.40.imagecreate.py index d23095a..e103f38 100644 --- a/modules/base/build.40.imagecreate.py +++ b/modules/base/build.40.imagecreate.py @@ -23,14 +23,16 @@ def main(): make_iso = ooblib.read_config_bool('base', 'make_iso') if make_iso: print "Building ISO image..." - creator = imgcreate.LiveImageCreator(ks, name, name) + creator = imgcreate.LiveImageCreator(ks, name, name, + tmpdir=ooblib.builddir) compress = ooblib.read_config_bool('base', 'compress_iso') if compress is None: compress = False creator.skip_compression = not compress else: print "Building directly into FS image..." - creator = imgcreate.LoopImageCreator(ks, 'imgcreatefs', name) + creator = imgcreate.LoopImageCreator(ks, 'imgcreatefs', name, + tmpdir=ooblib.builddir) try: creator.mount(cachedir=cache_dir) -- cgit v0.9.1