merge from taroon

fairly large merge, but all fairly obvious stuff.  will test in a tree tomorrow

4 files changed, 20 insertions, 3 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 8c9558d74..768f995c6 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -576,6 +576,7 @@ EOF
 
     dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=16000 2>/dev/null
     mke2fs -F -q $MBD_DIR/etc/ramfs.img.big
+    tune2fs -c0 -i0 $MBD_DIR/etc/ramfs.img.big
     gzip -9 < $MBD_DIR/etc/ramfs.img.big > $MBD_DIR/etc/ramfs.img
     rm -f $MBD_DIR/etc/ramfs.img.big
 
@@ -587,6 +588,7 @@ EOF
     rm -f $MBD_FSIMAGE
     dd if=/dev/zero of=$MBD_FSIMAGE bs=1k count=$INITRDSIZE 2> /dev/null
     /sbin/mke2fs -F -i 1024 -q $MBD_FSIMAGE $INITRDSIZE > /dev/null 2>/dev/null
+    /sbin/tune2fs -c0 -i0 $MBD_FSIMAGE
 
     rm -rf $MBD_MNTPOINT
     mkdir $MBD_MNTPOINT
@@ -702,6 +704,7 @@ makeImage () {
 
     dd if=/dev/zero of=$MI_TMPIMAGE bs=1k count=$MI_SIZE 2>/dev/null
     /sbin/mke2fs -q -F -i 4096 $MI_TMPIMAGE  > /dev/null 2>/dev/null
+    /sbin/tune2fs -c0 -i0 $MI_TMPIMAGE
     mount -o loop $MI_TMPIMAGE $MI_MNTPOINT
     (cd $MI_FROM; find . | cpio --quiet -p $MI_MNTPOINT)
 
@@ -774,6 +777,7 @@ makemainimage () {
         fi
         dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null
         mke2fs -q -F $mmi_tmpimage > /dev/null 
+	tune2fs -c0 -i0 $mmi_tmpimage
         mount -o loop $mmi_tmpimage $mmi_mntpoint
 
         (cd $IMGPATH; find . | fgrep -v "./usr/lib/anaconda-runtime" |
@@ -827,6 +831,7 @@ makedriverdisk () {
 
     dd if=/dev/zero of=/tmp/$diskname.img bs=1k count=$size 2> /dev/null
     /sbin/mke2fs -q -F -i 4096 /tmp/$diskname.img  > /dev/null 2>/dev/null
+    /sbin/tune2fs -c0 -i0 /tmp/$diskname.img
     mkdir -p /tmp/mkdd.$$
     mount -t ext2 -o loop /tmp/$diskname.img /tmp/mkdd.$$
     rmdir /tmp/mkdd.$$/lost+found
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 963209456..20a0a51f5 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -378,6 +378,7 @@ EOF
 
     dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=17000
     mke2fs -F -q $MBD_DIR/etc/ramfs.img.big
+    tune2fs -c0 -i0 $MBD_DIR/etc/ramfs.img.big
     gzip -9 < $MBD_DIR/etc/ramfs.img.big > $MBD_DIR/etc/ramfs.img
     rm -f $MBD_DIR/etc/ramfs.img.big
 
@@ -389,6 +390,7 @@ EOF
     rm -f $MBD_FSIMAGE
     dd if=/dev/zero of=$MBD_FSIMAGE bs=1k count=$INITRDSIZE 2> /dev/null
     /sbin/mke2fs -F -i 1024 -q $MBD_FSIMAGE $INITRDSIZE #> /dev/null 2>/dev
+    /sbin/tune2fs -c0 -i0 $MBD_FSIMAGE
     rm -rf $MBD_MNTPOINT
     mkdir $MBD_MNTPOINT
     mount -o loop -t ext2 $MBD_FSIMAGE $MBD_MNTPOINT
@@ -445,6 +447,9 @@ makeBootImages() {
 	    --loaderbin loader \
 	    --modules "$NETWORKMODULES"
 	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
+
+	cp -v $BOOTDISKDIR/generic.prm $TOPDESTPATH/images/generic.prm
+	cp -v $BOOTDISKDIR/generic.ins $TOPDESTPATH/generic.ins
 }
 
 makeSecondStage() {
diff --git a/scripts/splittree.py b/scripts/splittree.py
index 29e7348e8..0fcff101e 100644
--- a/scripts/splittree.py
+++ b/scripts/splittree.py
@@ -76,7 +76,7 @@ self.reverse_sort_srpms : sort the srpms in reverse order to
 fit. Usually only needed if we share a disc between SRPMs
 and RPMs. Set to 1 to turn on."""
         
-        self.target_size = 648.0 * 1024.0 * 1024
+        self.target_size = 640.0 * 1024.0 * 1024
         self.fudge_factor = 1.2 * 1024.0 * 1024
         self.comps_size = 10.0 * 1024 * 1024
         self.release_str = None
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 96d78d053..d5f235fae 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -649,6 +649,8 @@ usr/share/zoneinfo/US
 usr/share/zoneinfo/Europe
 usr/share/zoneinfo/Japan
 usr/share/zoneinfo/America
+usr/share/zoneinfo/Asia
+usr/share/zoneinfo/Atlantic
 "
 
 # sparc needs 100dpi fonts as well, otherwise
@@ -981,8 +983,8 @@ for p in $DEST $DESTGR; do
 	   (cd $p/lib; rm -f libnss_files.so.1 libnss_dns.so.1)
 	fi
 
-	if [ -d $TZDIR/usr/share/zoneinfo ]; then
-	    (cd $TZDIR/usr/share/zoneinfo; find . -type f -or -type l | 
+	if [ -d $DEST/usr/share/zoneinfo ]; then
+	    (cd $DEST/usr/share/zoneinfo; find . -type f -or -type l | 
 		grep '^./[A-Z]' | sort | sed 's/^..//' | 
 		gzip -9) > $p/usr/lib/timezones.gz
 	else
@@ -1014,6 +1016,11 @@ if [ -n "$NEEDGR" ]; then
     rm -f $DESTGR/usr/bin/fc-cache
 fi
 
+echo "Creating debug dir"
+for p in $DEST $DESTGR ; do
+    mkdir -p $p/usr/lib/debug
+done
+
 
 if [ $ARCH = "alpha" ]; then
     rm -rf $DEST/usr/share/locale