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 > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 05-06-2010, 08:54 PM
David Cantrell
 
Default Update generic.ins for s390x (#546422)

Remove initrd.size line, replace with initrd.addrsize line. Update
mk-images.s390 to set the initrd.img load address at image creation
time.
---
bootdisk/s390x/generic.ins | 4 ++--
scripts/mk-images.s390 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootdisk/s390x/generic.ins b/bootdisk/s390x/generic.ins
index 9f67e58..a690f2e 100644
--- a/bootdisk/s390x/generic.ins
+++ b/bootdisk/s390x/generic.ins
@@ -1,5 +1,5 @@
* minimal lpar ins file
images/kernel.img 0x00000000
-images/initrd.img 0x02000000
+images/initrd.img @INITRD_LOAD_ADDRESS@
images/generic.prm 0x00010480
-images/initrd.size 0x00010410
+images/initrd.addrsize 0x00010408
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 2ee2bde..53a9c9d 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -42,7 +42,7 @@ makeBootImages() {

cp -v $BOOTDISKDIR/redhat.exec $TOPDESTPATH/images/redhat.exec
cp -v $BOOTDISKDIR/generic.prm $TOPDESTPATH/images/generic.prm
- cp -v $BOOTDISKDIR/generic.ins $TOPDESTPATH/generic.ins
+ sed -e "s|@INITRD_LOAD_ADDRESS@|$INITRD_ADDRESS|g" < $BOOTDISKDIR/generic.ins > $TOPDESTPATH/generic.ins

$MKS390CDBOOT
-i $TOPDESTPATH/images/kernel.img
--
1.6.6.1

_______________________________________________
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 06:59 AM.

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