kadischi/livecd_generator kadischi.py,1.29,1.30

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7276/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
Fixes, loose ends for kadischi functionality since rewrites.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kadischi.py	5 Jul 2006 02:28:55 -0000	1.29
+++ kadischi.py	5 Jul 2006 05:34:50 -0000	1.30
@@ -150,18 +150,18 @@
     # install boot
     print "[kadischi]: installing boot & config files in compressed tree"
     boot = normalize_path([bindir, 'install-boot.sh'])
-    args = [boot, sysdir, csysdir, kernel_version]
+    args = [boot, sysdir, csysdir, kernel]
     execute(args)
 
     # conf files in compressed tree (they shoudn't be compressed)
     tarball = normalize_path([sysdir, '/livecd/kadischi.tar.gz'])
     dest_tarball = normalize_path([csysdir, '/livecd/kadischi.tar.gz'])
-    args = ["cp", "-f", tarball, dest_tarball]
+    args = ["/bin/cp", "-f", tarball, dest_tarball]
     execute(args)
 
     # delete sysdir - we don`t need it anymore
     print "[kadischi]: removing uncompressed tree"
-    cleanup(sysdir)
+    clean_directory(sysdir)
 
     # create iso image
     print "[kadischi]: creating iso image %s" % isoimage
@@ -287,6 +287,7 @@
 def make_initrds(sysdir, bindir):
     clear_rpm_db_files(sysdir)
     ts = rpm.TransactionSet(sysdir)
+    global kernel, kernel_smp
     kernel = None
     kernel_smp = None
     if isys.smpAvailable() or isys.htavailable():