merge from anaconda-7-0-alpha-branch

3 files changed, 49 insertions, 4 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index dbd1b896d..7d82b142c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -267,6 +267,7 @@ makemoduleball() {
     find $version -type f | cpio --quiet -H crc -o | gzip -9 > ../$MMB_NAME
     cd ..
     rm -rf modules
+    chmod 644 *
     popd  > /dev/null
 }
 
@@ -588,6 +589,7 @@ makeImage () {
     rmdir $MI_MNTPOINT
 
     gzip -9 < $MI_TMPIMAGE > $MI_TO
+    chmod 644 $MI_TO
 
     echo "Wrote $MI_TO (${left}k of ${MI_SIZE}k free)"
 }
@@ -660,6 +662,7 @@ makemainimage () {
     umount $mmi_mntpoint
 
     cp $mmi_tmpimage $INSTIMGPATH/${imagename}.img
+    chmod 644 $INSTIMGPATH/${imagename}.img
 
     echo "Wrote $INSTIMGPATH/${imagename}.img (${SIZE}k)"
 
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index 776134b90..9d618f269 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -2,7 +2,7 @@ SECSTAGE="vfat raid0 raid1 raid5"
 
 prepareBootImage() {
         dd if=/dev/zero of=$MBD_TMPIMAGE bs=1k count=$BOOTDISKSIZE 2>/dev/null
-        echo y | /sbin/mke2fs -i 4096 $MBD_TMPIMAGE  > /dev/null 2>/dev/null
+        echo y | /sbin/mke2fs -b 1024 -r 0 -O none $MBD_TMPIMAGE  > /dev/null 2>/dev/null
 	LODEV=`findloopdevice $MBD_TMPIMAGE`
 	e2writeboot $LODEV $BOOTDISKDIR/bootlx
 	mount $LODEV -t ext2 $MBD_BOOTTREE
@@ -28,8 +28,24 @@ SCSIMODULES="DAC960"
 mkdir -p $TOPDESTPATH/boot
 cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
 
+mkdir -p $TOPDESTPATH/etc
+cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
+#
+# Red Hat Linux/Alpha aboot configuration
+#
+# Options:
+#
+#   0 - boot into the Red Hat Linux installer
+#   1 - boot into the Red Hat Linux installer using a 2.4 kernel
+#   2 - boot into the Red Hat Linux installer using a Jensen kernel
+#
+0:/kernels/vmlinux.gz initrd=/images/ramdisk.img
+1:/kernels/vmlinuz.24 initrd=/images/ramdisk.img
+2:/kernels/vmlinuz.j initrd=/images/ramdisk.img
+EOF
+
 makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
-	   --initrdsize 3000 \
+	   --initrdsize 4096 \
 	   --padsize 1440 \
 	   --loaderbin loader \
 	   --modules "$NETMODULES $SCSIMODULES vfat"
@@ -38,6 +54,27 @@ makebootdisk --bootdisksize 1440 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
 	     --imagename generic.img
 
 makemainmodules "$SECSTAGE $SCSIMODULES"
-makeinstimage --size1 3700 --size2 3600 "netstg" "$SECSTAGE $SCSIMODULES"
-makeinstimage --size1 3700 --size2 3600 "hdstg" "$SECSTAGE $NETMODULES"
+makeinstimage --size1 3800 --size2 4096 "netstg" "$SECSTAGE $SCSIMODULES"
+makeinstimage --size1 3800 --size2 4096 "hdstg" "$SECSTAGE $NETMODULES"
 makemainimage "stage2"
+
+if [ -f $TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm ]; then
+    K24_PKG=$TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm
+    K24_DIR=/tmp/kernel24.dir.$$
+    mkdir -p $K24_DIR
+    rpm2cpio $K24_PKG | (cd $K24_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
+    cp $K24_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.24
+    rm -rf $K24_DIR
+fi
+
+
+if [ -f $KERNELPATH/kernel-jensen-*.rpm ]; then
+    KJ_PKG=$KERNELPATH/kernel-jensen-*.rpm
+    KJ_DIR=/tmp/kernelj.dir.$$
+    mkdir -p $KJ_DIR
+    rpm2cpio $KJ_PKG | (cd $KJ_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
+    cp $KJ_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.j
+    rm -rf $KJ_DIR
+fi
+
+
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8a727565c..8678ac9b9 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -580,6 +580,11 @@ if [ -d $DEST/usr/share/locale ]; then
     done
 fi
 
+if [ $ARCH = "alpha" ]; then
+    rm -rf $DEST/usr/share/locale
+    rm -rf $DEST/usr/lib/locale
+fi
+
 echo "Patching python library..."
 
 # always use passive mode for ftp installs