-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
As stated in the previous two emails, I maintain that "initrd.patch" will be
misleading. Name it something other than initrd.addr if it must be something,
just not initrd.patch.
On Wed, 5 May 2010, Steffen Maier wrote:
Please correct the totally misleading file naming.
It contains both load address and initrd size, so just call it
initrd.patch as we already did suggest.
On 05/04/2010 11:40 PM, David Cantrell wrote:
Set the initrd.img load address in generic.ins at boot image creation
time.
---
bootdisk/s390x/generic.ins | 4 ++--
scripts/mk-images.s390 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bootdisk/s390x/generic.ins b/bootdisk/s390x/generic.ins
index 9f67e58..e2eeee8 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.addr 0x00010408
images/initrd.patch 0x00010408
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index b2c4c92..cd6549f 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -19,7 +19,7 @@
# initrd.img load address for generic.ins LPAR booting
# See https://bugzilla.redhat.com/show_bug.cgi?id=546422 for details.
-INITRD_ADDR=0x2000000
+INITRD_ADDR=0x02000000
getAllS390ModuleNames() {
s390dir="${KERNELROOT}/lib/modules/${version}/kernel/drivers/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_ADDR|g" < $BOOTDISKDIR/generic.ins > $TOPDESTPATH/generic.ins
$MKS390CDBOOT \
-i $TOPDESTPATH/images/kernel.img \
Steffen
Linux on System z Development
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkvgwkEACgkQ5hsjjIy1VkmNogCfT8S9mCkBxVPTUTHKx/dzk1Pd
ivoAoKVnFMGXVGQ2ez930Lm/B1k58Ko0
=PH/P
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
