diff options
| author | Jesse Keating <jkeating@redhat.com> | 2009-03-02 15:57:06 -0800 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-03-02 15:20:14 -1000 |
| commit | 493b0d7cdbca5bbd67a1fec8f713deb245ca8a13 (patch) | |
| tree | 9caac3c13428cd50ac115a3f7fef616055f47f31 /scripts | |
| parent | 97c04f48e948e61902189a9bcfc510cf88d16ec3 (diff) | |
| download | anaconda-493b0d7cdbca5bbd67a1fec8f713deb245ca8a13.tar.gz anaconda-493b0d7cdbca5bbd67a1fec8f713deb245ca8a13.tar.xz anaconda-493b0d7cdbca5bbd67a1fec8f713deb245ca8a13.zip | |
Update syslinux path to /usr/share instead of /usr/lib
Signed-off-by: David Cantrell <dcantrell@redhat.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 6 | ||||
| -rw-r--r-- | scripts/mk-images.x86 | 8 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 1b483f25a..d4cac465f 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -810,8 +810,8 @@ makemainimage () { ERROR=$(du -sk $IMGPATH/usr/lib/anaconda-runtime | awk '{ print $1 }') SIZE=$(expr $SIZE - $ERROR) fi - if [ -d $IMGPATH/usr/lib/syslinux ]; then - ERROR=$(du -sk $IMGPATH/usr/lib/syslinux | awk '{ print $1 }') + if [ -d $IMGPATH/usr/share/syslinux ]; then + ERROR=$(du -sk $IMGPATH/usr/share/syslinux | awk '{ print $1 }') SIZE=$(expr $SIZE - $ERROR) fi dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null @@ -821,7 +821,7 @@ makemainimage () { (cd $IMGPATH; find . | fgrep -v "./usr/lib/anaconda-runtime" | - fgrep -v "./usr/lib/syslinux" + fgrep -v "./usr/share/syslinux" cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd) makeproductfile $mmi_mntpoint umount $mmi_mntpoint diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index fd154594a..1a77b6e2f 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -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" @@ -38,7 +38,7 @@ prepareBootTree() { if [ -f $IMGPATH/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg ]; then cp $IMGPATH/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg $MBD_BOOTTREE/splash.jpg - cp $IMGPATH/usr/lib/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32 + cp $IMGPATH/usr/share/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32 sed -i s'/default linux/default vesamenu.c32/g' $MBD_BOOTTREE/syslinux.cfg sed -i 's/prompt 1/#prompt 1/g' $MBD_BOOTTREE/syslinux.cfg elif [ -x $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh ]; then @@ -102,12 +102,12 @@ makeBootImages() { [ $? = 0 ] || exit 1 if [ "$kernelvers" != "$kernelxen" ] ; then - 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 a26a5231e..a4d7c83bb 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -513,7 +513,7 @@ usr/lib/python?.?/site-packages/yum usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc -usr/lib/syslinux +usr/share/syslinux usr/lib/yaboot usr/lib/yum-plugins/blacklist.py* usr/lib/yum-plugins/fedorakmod.py* |