[PATCH] Use correct kernel-bootwrapper on ppc64.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



In scripts/upd-instroot, include kernel-bootwrapper on ppc and ppc64 in
the $PACKAGES list.  And make sure we keep and use
/usr/lib64/kernel-wrapper files.
---
 scripts/mk-images.ppc |    4 ++--
 scripts/upd-instroot  |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index b90865b..d560d21 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -48,11 +48,11 @@ __EOT__
 		rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds
 		popd
         echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo
-	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/lib64/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/lib/kernel-wrapper		\
+					  -D $IMGPATH/usr/lib64/kernel-wrapper		\
 					     $TOPDESTPATH/ppc/ppc64/vmlinuz
 		rmdir $TOPDESTPATH/images/netboot || :
 		echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 03202b0..0339392 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -229,7 +229,7 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
 fi
 
 if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
-    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
+    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils kernel-bootwrapper"
 fi
 
 #
@@ -463,6 +463,7 @@ usr/$LIBDIR/gtk-2.0/*/loaders/*la*
 usr/$LIBDIR/gtk-2.0/*/loaders/*png*
 usr/$LIBDIR/gtk-2.0/*/loaders/*xpm*
 usr/$LIBDIR/gtk-2.0/immodules
+usr/$LIBDIR/kernel-wrapper/*
 usr/$LIBDIR/hal
 usr/$LIBDIR/libuser/*
 usr/$LIBDIR/pango
-- 
1.6.2.5

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

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux