diff --git a/data/jessie/s390x/d390.ins b/data/jessie/s390x/d390.ins index 78c5f117..a02a1e2d 100644 --- a/data/jessie/s390x/d390.ins +++ b/data/jessie/s390x/d390.ins @@ -3,4 +3,4 @@ linux_vm 0x00000000 root.off 0x0001040c root.siz 0x00010414 parmfile 0x00010480 -root.bin 0x00800000 +root.bin 0x01000000 diff --git a/data/stretch/s390x/d390.ins b/data/stretch/s390x/d390.ins index 78c5f117..a02a1e2d 100644 --- a/data/stretch/s390x/d390.ins +++ b/data/stretch/s390x/d390.ins @@ -3,4 +3,4 @@ linux_vm 0x00000000 root.off 0x0001040c root.siz 0x00010414 parmfile 0x00010480 -root.bin 0x00800000 +root.bin 0x01000000 diff --git a/debian/changelog b/debian/changelog index d2f92209..8af16efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium * Make stretch the default suite in the easy-build.sh script. [ Philipp Kern ] + * Load the s390x initrd at 0x01000000 to allow kernels larger than + 8 MiB (and smaller than 16 MiB) to be loaded via the ins loader. * Drop the remaining s390 bits from stretch and jessie. (s390x remains.) * Drop the d390oco loader from stretch and jessie. diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x index 1f5f7508..c9f73ad3 100644 --- a/tools/boot/jessie/boot-s390x +++ b/tools/boot/jessie/boot-s390x @@ -83,7 +83,7 @@ cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/" sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins" # Create the files specifying offset and size of the initrd -perl -e "print pack('N', 0x800000)" >"$imagedir/root.off" +perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off" perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz" # Copy the README file diff --git a/tools/boot/stretch/boot-s390x b/tools/boot/stretch/boot-s390x index 92dc73bf..30eab52b 100644 --- a/tools/boot/stretch/boot-s390x +++ b/tools/boot/stretch/boot-s390x @@ -84,7 +84,7 @@ cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/" sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins" # Create the files specifying offset and size of the initrd -perl -e "print pack('N', 0x800000)" >"$imagedir/root.off" +perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off" perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz" # Copy the README file