From 38da8326192312f3a558403b552808941e01bbff Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Wed, 30 Nov 2011 17:49:48 +0000
Subject: [PATCH] Add an extra tweaked version of d390.ins for s390 booting.
 The Hardware Management Console needs the file to be in the root directory.

---
 debian/changelog             | 5 +++++
 tools/boot/squeeze/boot-s390 | 1 +
 tools/boot/wheezy/boot-s390  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0b6fab32..32dfef10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,11 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
       (and fix debian/rules to not re-add it).
     + Bump Standards-Version to 3.9.2 (no change required).
 
+  [ Philipp Kern ]
+  * Add an extra tweaked version of d390.ins for s390 booting. The
+    Hardware Management Console needs the file to be in the root
+    directory.
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
 
 debian-cd (3.1.7) unstable; urgency=low
diff --git a/tools/boot/squeeze/boot-s390 b/tools/boot/squeeze/boot-s390
index 34b8351d..15f3172d 100755
--- a/tools/boot/squeeze/boot-s390
+++ b/tools/boot/squeeze/boot-s390
@@ -86,6 +86,7 @@ done
 # - d390.tdf    : for booting from emulated tape
 # - d390oco.tdf : same, using object-code-only-modules-ramdisk (example)
 cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
+sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/s390/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"
diff --git a/tools/boot/wheezy/boot-s390 b/tools/boot/wheezy/boot-s390
index 45f8f7be..cfb56aab 100755
--- a/tools/boot/wheezy/boot-s390
+++ b/tools/boot/wheezy/boot-s390
@@ -86,6 +86,7 @@ done
 # - d390.tdf    : for booting from emulated tape
 # - d390oco.tdf : same, using object-code-only-modules-ramdisk (example)
 cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
+sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/s390/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"