On other platforms we call it initrd.img, no reason to do otherwise on ppc64. Besides, it was still called ramdisk.image.gz despite being compressed using xz. Related: rhbz#703914 --- bootdisk/ppc/yaboot.conf.3264 | 4 ++-- bootdisk/ppc/yaboot.conf.in | 2 +- scripts/mk-images.ppc | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/bootdisk/ppc/yaboot.conf.3264 b/bootdisk/ppc/yaboot.conf.3264 index 8b5af08..0db8dd2 100644 --- a/bootdisk/ppc/yaboot.conf.3264 +++ b/bootdisk/ppc/yaboot.conf.3264 @@ -5,10 +5,10 @@ default=linux image=/ppc/ppc64/vmlinuz label=linux64 alias=linux - initrd=/ppc/ppc64/ramdisk.image.gz + initrd=/ppc/ppc64/initrd.img read-only image=/ppc/ppc32/vmlinuz label=linux32 - initrd=/ppc/ppc32/ramdisk.image.gz + initrd=/ppc/ppc32/initrd.img read-only diff --git a/bootdisk/ppc/yaboot.conf.in b/bootdisk/ppc/yaboot.conf.in index d06768a..b693866 100644 --- a/bootdisk/ppc/yaboot.conf.in +++ b/bootdisk/ppc/yaboot.conf.in @@ -4,5 +4,5 @@ default=linux image=/ppc/ppc%BITS%/vmlinuz label=linux - initrd=/ppc/ppc%BITS%/ramdisk.image.gz + initrd=/ppc/ppc%BITS%/initrd.img read-only diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index ae81764..18cf445 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -17,6 +17,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +RAMDISK="initrd.img" + makeBootImages() { echo "Building boot images for kernel $kernelvers" FAKEARCH="" @@ -24,14 +26,14 @@ makeBootImages() { if [ "$KERNELARCH" = "ppc64" ]; then mkdir -p $TOPDESTPATH/ppc/ppc64 echo "Building $KERNELARCH initrd" - makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ + makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/$RAMDISK \ --initrdsize 8192 \ --loaderbin loader \ --modules "$INITRDMODS spufs viocd gpio_mdio" - if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz) > 32*1024*1024 )); then + if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024 )); then echo "***" - echo "*** PPC64 ramdisk.image.gz is larger than 32 MB, aborting" + echo "*** PPC64 $RAMDISK is larger than 32 MB, aborting" echo "***" echo "*** This file is generated by scripts/mk-images.ppc in anaconda, but the most" echo "*** likely causes of this problem are:" @@ -51,14 +53,14 @@ makeBootImages() { cat << __EOT__ >> $TOPDESTPATH/.treeinfo [images-$KERNELARCH] kernel = ppc/ppc64/vmlinuz -initrd = ppc/ppc64/ramdisk.image.gz +initrd = ppc/ppc64/$RAMDISK __EOT__ if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then mkdir -p $TOPDESTPATH/images/netboot pushd $TOPDESTPATH/ppc/ppc64 cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc64/zImage.lds - $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc64/vmlinuz no no $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc64.img + $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc64/vmlinuz no no $TOPDESTPATH/ppc/ppc64/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc64.img rmdir $TOPDESTPATH/images/netboot || : rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds popd @@ -68,7 +70,7 @@ __EOT__ elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then mkdir -p $TOPDESTPATH/images/netboot $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc64.img \ - -i $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ + -i $TOPDESTPATH/ppc/ppc64/$RAMDISK \ -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc64/vmlinuz rmdir $TOPDESTPATH/images/netboot || : @@ -86,7 +88,7 @@ __EOT__ mkdir -p $TOPDESTPATH/ppc/mac echo "Building ppc initrd" - makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \ + makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/$RAMDISK \ --initrdsize 8192 \ --loaderbin loader \ --modules "$INITRDMODS" @@ -98,13 +100,13 @@ __EOT__ cat << __EOT__ >> $TOPDESTPATH/.treeinfo [images-$KERNELARCH] kernel = ppc/ppc32/vmlinuz -initrd = ppc/ppc32/ramdisk.image.gz +initrd = ppc/ppc32/$RAMDISK __EOT__ if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then mkdir -p $TOPDESTPATH/images/netboot pushd $TOPDESTPATH/ppc/ppc32 cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc32/zImage.lds - $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc32/vmlinuz no no $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc32.img + $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc32/vmlinuz no no $TOPDESTPATH/ppc/ppc32/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc32.img rmdir $TOPDESTPATH/images/netboot || : rm -f $TOPDESTPATH/ppc/ppc32/zImage.lds popd @@ -114,7 +116,7 @@ __EOT__ elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then mkdir -p $TOPDESTPATH/images/netboot $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc32.img \ - -i $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \ + -i $TOPDESTPATH/ppc/ppc32/$RAMDISK \ -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc32/vmlinuz rmdir $TOPDESTPATH/images/netboot || : -- 1.7.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
