Check the size of ppc64.img in addition to initrd.img to see if it's greater than 32M. This script is a minefield, so anything that looks redundant or extra, I prefer to not change.
Related to 1006043. Another patch coming to reduce the size of ppc64.img once feedback is received from IBM Australia.
Similar to the existing check we have for the initrd.img, we need to also check the ppc64.img to see if it's larger than 32M.
Related: rhbz#1006043 --- scripts/mk-images.ppc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 18cf445..ca2069e 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -31,9 +31,13 @@ makeBootImages() { --loaderbin loader \ --modules "$INITRDMODS spufs viocd gpio_mdio"
- if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024 )); then + ramdiskOversized=$(($(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024)) + netbootOversized=$(($(stat --format=%s $TOPDESTPATH/images/netboot/ppc64.img) > 32*1024*1024)) + + if [ $ramdiskOversized -o $netbootOversized ]; then echo "***" - echo "*** PPC64 $RAMDISK is larger than 32 MB, aborting" + [ $ramdiskOversized ] && echo "*** PPC64 ppc/ppc64/$RAMDISK is larger than 32 MB, aborting" + [ $netbootOversized ] && echo "*** PPC64 images/netboot/ppc64.img 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:"
On Wed, Sep 18, 2013 at 11:17:41AM -0400, David Cantrell wrote:
Similar to the existing check we have for the initrd.img, we need to also check the ppc64.img to see if it's larger than 32M.
Related: rhbz#1006043
scripts/mk-images.ppc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 18cf445..ca2069e 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -31,9 +31,13 @@ makeBootImages() { --loaderbin loader \ --modules "$INITRDMODS spufs viocd gpio_mdio"
- if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024 )); then
- ramdiskOversized=$(($(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024))
- netbootOversized=$(($(stat --format=%s $TOPDESTPATH/images/netboot/ppc64.img) > 32*1024*1024))
- if [ $ramdiskOversized -o $netbootOversized ]; then echo "***"
echo "*** PPC64 $RAMDISK is larger than 32 MB, aborting"
[ $ramdiskOversized ] && echo "*** PPC64 ppc/ppc64/$RAMDISK is larger than 32 MB, aborting"[ $netbootOversized ] && echo "*** PPC64 images/netboot/ppc64.img 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:"-- 1.7.1
Ack
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
David Cantrell