--- scripts/mk-images | 2 +- scripts/mk-images.x86 | 6 +++--- scripts/upd-instroot | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 61dc004..4823ad0 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -886,7 +886,7 @@ done doPostImages # do some clean up before making the cramfs of the second stage -rm -rf $INSTIMGTEMPLATE/usr/lib/anaconda-runtime $INSTIMGTEMPLATE/usr/lib/syslinux $IMGPATH/usr/lib/syslinux +rm -rf $INSTIMGTEMPLATE/usr/lib/anaconda-runtime $INSTIMGTEMPLATE/usr/share/syslinux $IMGPATH/usr/share/syslinux if [ -n "$foundakernel" ]; then # make the second stage diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 38556f6..d56d782 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -1,4 +1,4 @@ -SYSLINUX=$IMGPATH/usr/lib/syslinux/syslinux-nomtools +SYSLINUX=$IMGPATH/usr/share/syslinux/syslinux-nomtools if [ ! -f $SYSLINUX ]; then echo "Warning: nomtools syslinux doesn't exist" @@ -67,12 +67,12 @@ makeBootImages() { --modules "$INITRDMODS" [ $? = 0 ] || exit 1 - if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then + if [ -f $IMGPATH/usr/share/syslinux/isolinux.bin ]; then echo "Building isolinux directory" MBD_BOOTTREE=$TOPDESTPATH/isolinux MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd.img mkdir $MBD_BOOTTREE - cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin + cp $IMGPATH/usr/share/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin prepareBootTree diff --git a/scripts/upd-instroot b/scripts/upd-instroot index d83d375..b18675d 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -775,7 +775,7 @@ usr/$LIBDIR/python?.?/site-packages/cairo/* usr/$LIBDIR/python?.?/site-packages/gtk*/gtk/* usr/$LIBDIR/python?.?/site-packages/gtk*/* usr/$LIBDIR/rpm/rpmpopt -usr/lib/syslinux/* +usr/share/syslinux/* usr/lib/yaboot/* usr/sbin/chroot usr/sbin/ddcprobe -- 1.7.9.5 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list