diff options
author | Daniel Drake <dsd@laptop.org> | 2012-07-04 17:15:40 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2012-07-04 17:15:40 (GMT) |
commit | 0943eb615e3def4212553e820a94df47a597b7e3 (patch) | |
tree | f6a80b9d99d9a6f85ef985b1b0af14599b83e102 | |
parent | da79b553b6d5a06d5e25b061b65df9d947dc5fbd (diff) |
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.
-rw-r--r-- | modules/base/build.40.imagecreate.py | 6 |
1 files changed, 4 insertions, 2 deletions
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) |