kadischi/livecd_generator install-boot.sh, 1.3, 1.4 kadischi, 1.1.1.1, 1.2 kadischi.py, 1.6, 1.7 livecd-mkinitrd.sh, 1.5, 1.6

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Thu Mar 30 05:46:08 UTC 2006


Author: autopsy

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

Modified Files:
	install-boot.sh kadischi kadischi.py livecd-mkinitrd.sh 
Log Message:
Organization of man pages, build.conf to kadischi.conf


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- install-boot.sh	30 Mar 2006 04:29:22 -0000	1.3
+++ install-boot.sh	30 Mar 2006 05:46:06 -0000	1.4
@@ -7,7 +7,7 @@
 kernel_version_proper=$(echo $kernel | sed -e 's|xen0||')
 kernel_params='selinux=0'
 
- . /etc/kadischi/build.conf
+ . /etc/kadischi/kadischi.conf
 
 if [ -x $sysdir/usr/bin/rhgb ]; then
    kernel_params="$kernel_params rhgb"


Index: kadischi
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kadischi	21 Aug 2005 17:09:00 -0000	1.1.1.1
+++ kadischi	30 Mar 2006 05:46:06 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
- . /etc/kadischi/build.conf
+ . /etc/kadischi/kadischi.conf
 
 export PYTHONPATH=$INSTALLDIR/lib:$PYTHONPATH
-exec python $INSTALLDIR/kadischi.py $@
\ No newline at end of file
+exec python $INSTALLDIR/kadischi.py $@


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kadischi.py	30 Mar 2006 04:29:22 -0000	1.6
+++ kadischi.py	30 Mar 2006 05:46:06 -0000	1.7
@@ -161,7 +161,7 @@
 # Set required filesystem_tools to something appropriate depending on what is chosen
 if options.filesystem == 'squashfs':
    filesystem_tools = 'squashfs-tools'
-else
+else:
    filesystem_tools = 'zisofs-tools'
 
 required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools)
@@ -179,15 +179,15 @@
 
 flc_log ('Looking for config file')
 
-if not os.path.isfile (normalize_path([confdir, 'build.conf'])):
-	flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'build.conf']))
+if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])):
+	flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf']))
 	sys.exit (1)
 
 # load config file options
 
 flc_log ('Loading config file options')
 
-buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True)
+buildconf = shvarFile (normalize_path([confdir, 'kadischi.conf']), True)
 builddir = buildconf ["BUILDDIR"]
 
 buildnum = str (int (buildconf ["BUILDNUM"]) + 1)


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- livecd-mkinitrd.sh	30 Mar 2006 04:29:22 -0000	1.5
+++ livecd-mkinitrd.sh	30 Mar 2006 05:46:06 -0000	1.6
@@ -24,7 +24,7 @@
 
 IMAGESIZE=10000
 
- . /etc/kadischi/build.conf
+ . /etc/kadischi/kadischi.conf
 
 usage () {
     echo "usage: `basename $0` [--version] [-v] [-f] [--nocompress]" >&2




More information about the fedora-extras-commits mailing list