diff options
| author | Jesse Keating <jkeating@redhat.com> | 2009-10-05 12:47:35 -0700 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-10-06 11:45:06 -0400 |
| commit | cf5051bc2e5595fe3f5bac22b5ab6fe2d0a54eb0 (patch) | |
| tree | d740f1f728e09fcf186b6b89c94148933f12c063 /scripts | |
| parent | 51a412840c1ce53c5fb74d9b70627d9b7a6bd8ff (diff) | |
| download | anaconda-cf5051bc2e5595fe3f5bac22b5ab6fe2d0a54eb0.tar.gz anaconda-cf5051bc2e5595fe3f5bac22b5ab6fe2d0a54eb0.tar.xz anaconda-cf5051bc2e5595fe3f5bac22b5ab6fe2d0a54eb0.zip | |
Use $LIBDIR to find the boot-wrapper file.
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | 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 1a85dc902..47af389f0 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 |