FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Gentoo > Gentoo Development

 
 
LinkBack Thread Tools
 
Old 03-02-2009, 10:57 PM
Jesse Keating
 
Default Update syslinux path to /usr/share instead of /usr/lib

---
scripts/mk-images | 6 +++---
scripts/mk-images.x86 | 8 ++++----
scripts/upd-instroot | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 1b483f2..d4cac46 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 fd15459..1a77b6e 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 a26a523..a4d7c83 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*
--
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 03-03-2009, 12:21 AM
David Cantrell
 
Default Update syslinux path to /usr/share instead of /usr/lib

Applied.

Jesse Keating wrote:

---
scripts/mk-images | 6 +++---
scripts/mk-images.x86 | 8 ++++----
scripts/upd-instroot | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 1b483f2..d4cac46 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 fd15459..1a77b6e 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 a26a523..a4d7c83 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*



--
David Cantrell <dcantrell@redhat.com>
Red Hat / Honolulu, HI

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 12:00 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org