Instead of using the hardcoded library path, use a variable which is set in mk-images, as it seems that they can work across arch like this, and we typically only have one wrapper file available to us at compose time. --- scripts/mk-images.ppc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 1a85dc9..47af389 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -50,11 +50,11 @@ __EOT__ if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib64/kernel-wrapper/wrapper.a ]; then + 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 \ - -D $IMGPATH/usr/lib64/kernel-wrapper \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc64/vmlinuz rmdir $TOPDESTPATH/images/netboot || : if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then @@ -96,11 +96,11 @@ __EOT__ if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib/kernel-wrapper/wrapper.a ]; then + 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 \ - -D $IMGPATH/usr/lib/kernel-wrapper \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc32/vmlinuz rmdir $TOPDESTPATH/images/netboot || : if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then -- 1.6.5.rc2 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
