From 591891c303907d08fc59eeaa0885e6acecb1b45c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 13 Dec 2012 15:52:08 -0800 Subject: [PATCH] livemedia-creator: use cmdline mode --- src/sbin/livemedia-creator | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 1b7eed4e..e5641b73 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -357,7 +357,7 @@ def anaconda_install( disk_img, disk_size, kickstart, repo, args ): mksparse( disk_img, disk_size * 1024**3 ) cmd = [ "anaconda", "--image", disk_img, "--kickstart", kickstart, - "--script", "--repo", repo_url ] + "--cmdline", "--repo", repo_url ] cmd += args return execWithRedirect( cmd[0], cmd[1:] ) @@ -775,12 +775,13 @@ if __name__ == '__main__': if not os.path.isdir( log_anaconda ): os.mkdir( log_anaconda ) for l in ["anaconda.log", "ifcfg.log", "program.log", "storage.log", - "yum.log"]: + "packaging.log", "yum.log"]: if os.path.exists( "/tmp/"+l ): shutil.copy2( "/tmp/"+l, log_anaconda ) os.unlink( "/tmp/"+l ) # If anaconda failed the disk image may still be in use by dm + execWithRedirect("anaconda-cleanup", []) dm_name = os.path.splitext(os.path.basename(disk_img))[0] dm_path = "/dev/mapper/"+dm_name if os.path.exists(dm_path):