kadischi/livecd_generator kadischi.py, 1.35, 1.36 livecd-mkinitrd.sh, 1.14, 1.15

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py livecd-mkinitrd.sh 
Log Message:
A few bugfixes, merged Zenity+Dialog+Shell userhome.sh scripts


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kadischi.py	9 Jul 2006 15:16:55 -0000	1.35
+++ kadischi.py	9 Jul 2006 17:45:04 -0000	1.36
@@ -111,7 +111,7 @@
     print "[kadischi]: running post installation scripts"
     run_scripts(sysdir, bindir, anaconda_args)
 
-    ### Calculate size of result ISO image by known ratios for SquashFS (anywhere from 2.5 to 2.7)
+    ### Calculate size of result ISO image by known ratios for SquashFS
     size = 0
     stepsize = 0
 
@@ -122,8 +122,12 @@
         stepsize = (size + stepsize)
 
     totalsize = stepsize
-    estimate0 = (totalsize / 2.5) ## Observed ratio for SquashFS
-    estimate1 = (totalsize / 2.7) ## Observed ratio for SquashFS
+    if (totalsize > 1600000000):
+        estimate0 = (totalsize / 2.3) ## Observed ratio for SquashFS
+        estimate1 = (totalsize / 2.5) ## Observed ratio for SquashFS
+    else:
+        estimate0 = (totalsize / 2.4) ## Observed ratio for SquashFS
+        estimate1 = (totalsize / 2.6) ## Observed ratio for SquashFS
 
     print ("[kadischi]: estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
 
@@ -148,7 +152,7 @@
 
     # Make the SquashFS image
     ctree = normalize_path([csysdir, 'kadischi.sqsh'])
-    args = ["/sbin/mksquashfs", sysdir, ctree]
+    args = ["/sbin/mksquashfs", sysdir, ctree, "-no-fragments"]
     execute (args)
 
     # install boot


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- livecd-mkinitrd.sh	4 Jul 2006 16:14:34 -0000	1.14
+++ livecd-mkinitrd.sh	9 Jul 2006 17:45:04 -0000	1.15
@@ -275,7 +275,7 @@
 fi
 
 inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox"
-for i in [ ash awk cat cut echo grep ifconfig ls lsmod mount pivot_root rmmod route sh sort umount sleep; do
+for i in [ ash awk cat cut echo grep ifconfig ls lsmod mount pivot_root rmmod route sh sort umount sleep halt; do
     /bin/ln -s busybox "$MNTIMAGE/bin/$i"
 done