diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-16 18:26:28 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-16 20:30:16 +0000 |
commit | a714fac3d2df7c1e81cf179c82741d6372dfa26b (patch) | |
tree | 381e15ac75d5b6cc680ab0c7103e528527d61e03 /morphlib | |
parent | 370588a06395f5c90c8fab115cb9748be105d664 (diff) | |
download | morph-a714fac3d2df7c1e81cf179c82741d6372dfa26b.tar.gz |
Fix how ldconfig is run
Now it should actually work.
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/builder.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index e93c8e79..beaa1df3 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -47,7 +47,7 @@ def ldconfig(ex, rootdir): cache = os.path.join(rootdir, 'etc', 'ld.so.cache') old_path = ex.env['PATH'] ex.env['PATH'] = '%s:/sbin:/usr/sbin:/usr/local/sbin' % old_path - ex.runv(['ldconfig', '-f', conf, '-C', cache, '-r', rootdir]) + ex.runv(['ldconfig', '-r', rootdir]) ex.env['PATH'] = old_path else: logging.debug('No %s, not running ldconfig' % conf) @@ -140,7 +140,7 @@ class BlobBuilder(object): ldconfig(ex, '/') else: self.msg('Unpacking chunk %s into staging' % chunk_name) - ex = morphlib.execute.Execute(self.staging, self.msg) + ex = morphlib.execute.Execute('/', self.msg) morphlib.bins.unpack_binary(chunk_filename, self.staging, ex) ldconfig(ex, self.staging) |