From e66694840950f6ebab7526a55d50790624d140ec Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Sun, 5 Oct 2008 15:42:26 -1000 Subject: [PATCH] Pass libdir scrubInstRoot(). --- src/pylorax/instroot.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pylorax/instroot.py b/src/pylorax/instroot.py index 3b16dc00..a05b1e0c 100644 --- a/src/pylorax/instroot.py +++ b/src/pylorax/instroot.py @@ -96,7 +96,7 @@ def createInstRoot(yumconf=None, arch=None, treedir=None, updates=None): sys.stderr.write("ERROR: Could not install packages.\n") sys.exit(1) - if not scrubInstRoot(destdir=destdir): + if not scrubInstRoot(destdir=destdir, libdir=libdir): sys.stderr.write("ERROR: Could not scrub instroot.\n") sys.exit(1) @@ -138,13 +138,14 @@ def installPackages(yumconf=None, destdir=None, packages=None): return True # Scrub the instroot tree (remove files we don't want, modify settings, etc) -def scrubInstRoot(destdir=None): - """scrubInstRoot(destdir=None) +def scrubInstRoot(destdir=None, libdir='lib'): + """scrubInstRoot(destdir=None, libdir='lib') Clean up the newly created instroot and make the tree more suitable to run the installer. - destdir is the path to the instroot and is the only required argument. + destdir is the path to the instroot. libdir is the subdirectory in + /usr for libraries (either lib or lib64). """