kadischi/livecd_generator kadischi.py, 1.8, 1.9 livecd-mkinitrd.sh, 1.6, 1.7

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py livecd-mkinitrd.sh 
Log Message:
Tighten up some small loose ends, reflect new filesystem option in the manual


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadischi.py	31 Mar 2006 21:03:36 -0000	1.8
+++ kadischi.py	4 Apr 2006 13:43:13 -0000	1.9
@@ -259,7 +259,12 @@
 
 flc_log ('making initrd image')
 
-run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
+if options.filesystem == 'squashfs':
+    kmods = 'fs/squashfs drivers/block/loop.ko'
+else:
+    kmods = ''
+
+run ("KMODULES='%s' %s %s %s" % (kmods, normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
 # move files 
 


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- livecd-mkinitrd.sh	30 Mar 2006 05:46:06 -0000	1.6
+++ livecd-mkinitrd.sh	4 Apr 2006 13:43:13 -0000	1.7
@@ -23,6 +23,7 @@
 rc=0
 
 IMAGESIZE=10000
+KMODULES="drivers/parport $KMODULES"
 
  . /etc/kadischi/kadischi.conf
 
@@ -256,7 +257,7 @@
 inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko)
+MODULES=$(findmodules $KMODULES)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done