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

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	create-iso.sh install-boot.sh kadischi.py livecd-mkinitrd.sh 
Log Message:
Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files.


Index: create-iso.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- create-iso.sh	21 Aug 2005 17:09:00 -0000	1.1.1.1
+++ create-iso.sh	30 Mar 2006 04:29:22 -0000	1.2
@@ -3,4 +3,4 @@
 sysdir=$1
 isoimage=$2
 
-mkisofs -quiet -z -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir
\ No newline at end of file
+mkisofs -quiet $MKISOFSOPTION -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- install-boot.sh	17 Mar 2006 22:30:00 -0000	1.2
+++ install-boot.sh	30 Mar 2006 04:29:22 -0000	1.3
@@ -5,7 +5,7 @@
 kernel=$3
 kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0)
 kernel_version_proper=$(echo $kernel | sed -e 's|xen0||')
-kernel_params=''
+kernel_params='selinux=0'
 
  . /etc/kadischi/build.conf
 


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kadischi.py	17 Mar 2006 22:30:00 -0000	1.5
+++ kadischi.py	30 Mar 2006 04:29:22 -0000	1.6
@@ -48,6 +48,8 @@
 
 parser.add_option ("", "--buildstamp", dest="buildstamp", help="buildstamp file (if not set, using the default buildstamp from the config directory)")
 
+parser.add_option ("", "--filesystem", dest="filesystem", help="set the filesystem to use on the iso to either zisofs[default] or squashfs.")
+
 flc_log ('Parsing command line arguments')
 (options, args) = parser.parse_args ()
 
@@ -156,7 +158,13 @@
 
 flc_log ('Checking required packages')
 
-required_rpms = ['anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs']
+# Set required filesystem_tools to something appropriate depending on what is chosen
+if options.filesystem == 'squashfs':
+   filesystem_tools = 'squashfs-tools'
+else
+   filesystem_tools = 'zisofs-tools'
+
+required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools)
 
 missing_rpms = check_installed_rpms ('/', required_rpms, False)
 
@@ -236,10 +244,10 @@
 scripts = []
 
 for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])):
-	for file in files:
-		file = normalize_path([bindir, 'post_install_scripts', file])
-		if os.access(file, 1):
-			scripts.append (file)
+       for filename in files:
+               filename = normalize_path([bindir, 'post_install_scripts', filename])
+               if os.access(filename, 1):
+                       scripts.append (filename)
 
 scripts.sort()
 
@@ -263,7 +271,19 @@
 
 flc_log ('compressing the tree (order a pizza `cause this will take a while)')
 
-run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir)
+if options.filesystem == 'squashfs':
+       # zisofs has a tree which can be seen; squashfs is a file that we mount
+       # loopback.  So we need to create supporting files and directories
+       # seperately.
+       os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
+       os.makedirs(normalize_path([csysdir, '/livecd']))
+       touch = file(normalize_path([csysdir, '.livecd']), 'w')
+       touch.close()
+       # compress a squashfs tree
+       run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
+else:
+       # compress a zisofs tree
+       run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir)
 
 # install boot & conf files in compressed tree (they shoudn`t be compressed)
 
@@ -283,7 +303,11 @@
 
 flc_log ('creating iso image %s' % isoimage)
 
-run ("%s %s %s" % (normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
+if options.filesystem == 'squashfs':
+       mkisoflags=''
+else:
+       mkisoflags='MKISOFSOPTION=-z '
+run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
 
 # delete builddir
 


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- livecd-mkinitrd.sh	17 Mar 2006 22:30:00 -0000	1.4
+++ livecd-mkinitrd.sh	30 Mar 2006 04:29:22 -0000	1.5
@@ -208,6 +208,7 @@
 mkdir -p $MNTIMAGE/proc
 mkdir -p $MNTIMAGE/sys
 mkdir -p $MNTIMAGE/sysroot
+mkdir -p $MNTIMAGE/cdrom
 mkdir -p $MNTIMAGE/tmp
 mkdir -p $MNTIMAGE/usr/lib
 mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs
@@ -255,9 +256,8 @@
 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"
 
-PPMODULES=$(findmodules drivers/parport)
-
-for MODULE in $PPMODULES; do
+MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko)
+for MODULE in $MODULES; do
     instmodule $MODULE
 done
 
@@ -270,6 +270,9 @@
 for i in 1 2 3 4; do
     mknod $MNTIMAGE/dev/tty$i c 4 $i
 done
+for i in 0 1 2 3 4 5 6 7 8 9; do
+    mknod $MNTIMAGE/dev/loop$i b 7 $i
+done
 
 inst $INSTALLDIR/initrd/livecd-linuxrc "$MNTIMAGE/linuxrc"