Stefan Fiedler <stefan.fiedler@students.jku.at>:

fixed bootdisk target to compress the initrd again (?!?!?) ...


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2582 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

target/bootdisk/build.sh

@@ -35,7 +35,7 @@ cd $disksdir; rm -rf isofs; mkdir -p isofs
 
 echo_status "Creating bootdisk/isofs directory.."
 ln 2nd_stage.tar.gz 2nd_stage_small.tar.gz isofs/
-ln *.img isofs/ 2>/dev/null || true # might not exist on some architectures
+ln *.img initrd.gz isofs/ 2>/dev/null || true # might not exist on some architectures
 
 echo_status "Creating isofs.txt file .."
 echo "DISK1	build/${ROCKCFG_ID}/bootdisk/isofs/ `

target/bootdisk/build_stage1.sh

@@ -84,6 +84,10 @@ rmdir $tmpdir/lost+found/
 cp -a initrd/* $tmpdir
 umount $tmpdir
 #
+echo_status "Compressing initrd image file."
+gzip -9 initrd.img 
+mv initrd{.img,}.gz
+#
 echo_status "Removing temporary files."
 losetup -d $tmpdev
 rm -rf $tmpdir

target/bootdisk/powerpc/build.sh

@@ -27,7 +27,7 @@ then
 	echo "Duplicates of /boot used on IBM RS/6k hardware." > etc/README
 	#
 	echo_status "Moving image (initrd) to yaboot directory."
-	mv -v initrd.img boot/
+	mv -v initrd.gz boot/
 	#
 	echo_status "Copy more config files."
 	cp -v $base/target/$target/powerpc/mapping .

target/bootdisk/powerpc/yaboot.conf

@@ -8,13 +8,13 @@ device=cd:
 ## CD-ROM Installs ##
 image=cd:,/boot/vmlinux
     label=install
-    initrd=cd:,/boot/initrd.img
+    initrd=cd:,/boot/initrd.gz
     initrd-size=8192
     append="root=/dev/ram devfs=nocompat init=/linuxrc rw"
 
 image=cd:,/boot/vmlinux
     label=install-novideo
-    initrd=cd:,/boot/initrd.img
+    initrd=cd:,/boot/initrd.gz
     initrd-size=8192
     append="root=/dev/ram devfs=nocompat init=/linuxrc rw video=ofonly"
 

target/bootdisk/x86/build.sh

@@ -21,7 +21,7 @@ then
 	tar --use-compress-program=bzip2 \
 	    -xf $base/download/bootdisk/mdlbl-$mdlbl_ver.tar.bz2
 	cd mdlbl-$mdlbl_ver
-	cp ../boot/vmlinuz .; cp ../initrd.img initrd; ./makedisks.sh
+	cp ../boot/vmlinuz .; cp ../initrd.gz initrd; ./makedisks.sh
 	for x in disk*.img; do mv $x ../floppy${x#disk}; done; cd ..
 	du -sh floppy*.img | while read x; do echo_status $x; done
 else
@@ -53,7 +53,7 @@ then
 	#
 	echo_status "Copy images to isolinux directory."
 	cp boot/memtest86.bin isolinux/memtest86
-	cp initrd.img boot/vmlinuz isolinux/
+	cp initrd.gz boot/vmlinuz isolinux/
 	#
 	cat > ../isofs_arch.txt <<- EOT
 		BOOT	-b isolinux/isolinux.bin -c isolinux/boot.catalog

target/bootdisk/x86/isolinux.cfg

@@ -18,7 +18,7 @@ F0 help0.txt
 
 LABEL ramdisk
 	kernel vmlinuz
-	APPEND initrd=initrd.img root=/dev/ram devfs=nocompat init=/linuxrc rw
+	APPEND initrd=initrd.gz root=/dev/ram devfs=nocompat init=/linuxrc rw
 
 LABEL linux
 	kernel vmlinuz

target/bootdisk/x86/lilo-conf-1x2

@@ -17,7 +17,7 @@ prompt
 image=/mnt/vmlinuz
 	read-write
 	append="root=/dev/ram devfs=nocompat init=/linuxrc"
-	initrd=/mnt/initrd.img
+	initrd=/mnt/initrd.gz
 	label=ramdisk
 
 image=/mnt/vmlinuz

target/bootdisk/x86/lilo-conf-288

@@ -17,7 +17,7 @@ prompt
 image=/mnt/vmlinuz
 	read-write
 	append="root=/dev/ram devfs=nocompat init=/linuxrc"
-	initrd=/mnt/initrd.img
+	initrd=/mnt/initrd.gz
 	label=ramdisk
 
 image=/mnt/vmlinuz