Merge lp:~xnox/debian-cd/ubuntu-branding-s390x into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

Ubuntu branding, to match next debian-installer upload.

[lp:~xnox/debian-cd/ubuntu-branding-s390x]

1928. By Dimitri John Ledkov on 2016-01-18

grammar, maybe.

[Steve Langasek (vorlon)]

Do the changes to the source paths being copied from the DI_DIR mean that a corresponding change has already landed to the debian-installer package?

review: Needs Information

[Steve Langasek (vorlon)]

Sorry, just read that you said it will match "next debian-installer upload". So yes, this looks good to me, I'll merge to trunk and wait for you to let me know when it should be deployed to production.

review: Approve

[Dimitri John Ledkov (xnox)]

It will be shortly, with the d-i upload for 4.3.0-7.18 kernel.

=== modified file 'data/xenial/s390x/README.boot'
--- data/xenial/s390x/README.boot	2015-12-11 11:50:48 +0000
+++ data/xenial/s390x/README.boot	2016-01-18 18:13:51 +0000
@@ -12,10 +12,5 @@
 network: all installer components and Debian packages are retrieved
 from a mirror.
 
-
-Tip for users of the Hercules emulator
---------------------------------------
-If you want to ipl the installer off this CD, mount it on the host
-system (e.g. on /media/cdrom) and enter the following in the Hercules
-management console:
-   ipl /media/cdrom/boot/d390.ins
+Exporting full .iso contents (including the hidden .disk directory)
+allows one to use the result as a valid mirror for installation.
 
=== removed file 'data/xenial/s390x/d390.tdf'
--- data/xenial/s390x/d390.tdf	2015-12-11 11:50:48 +0000
+++ data/xenial/s390x/d390.tdf	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-@TDF
-H:\BOOT\LINUX_TP  UNDEFINED RECSIZE 1024
-H:\BOOT\PARMFILE  UNDEFINED RECSIZE 1024
-H:\BOOT\ROOT.BIN  UNDEFINED RECSIZE 1024
-TM
-TM
-EOT
 
=== renamed file 'data/xenial/s390x/d390.ins' => 'data/xenial/s390x/ubuntu.ins'
--- data/xenial/s390x/d390.ins	2015-12-11 11:50:48 +0000
+++ data/xenial/s390x/ubuntu.ins	2016-01-18 18:13:51 +0000
@@ -1,6 +1,6 @@
-* Debian GNU/Linux for S/390 (boot from CD-ROM or FTP-Server)
-linux_vm 0x00000000
-root.off 0x0001040c
-root.siz 0x00010414
-parmfile 0x00010480
-root.bin 0x01000000
+* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
+kernel.ubuntu 0x00000000
+initrd.off 0x0001040c
+initrd.siz 0x00010414
+parmfile.ubuntu 0x00010480
+initrd.ubuntu 0x01000000
 
=== modified file 'tools/boot/xenial/boot-s390x'
--- tools/boot/xenial/boot-s390x	2015-12-16 21:52:35 +0000
+++ tools/boot/xenial/boot-s390x	2016-01-18 18:13:51 +0000
@@ -44,25 +44,22 @@
 mkdir -p $imagedir
 DI_DIR="$DI_PATH/current/images"
 
-cp -lf "$DI_DIR/generic/debian.exec" $imagedir
-cp -lf "$DI_DIR/generic/parmfile.debian" $imagedir
-cp -lf "$DI_DIR/generic/initrd.debian" $imagedir
-cp -lf "$DI_DIR/generic/kernel.debian" $imagedir
+cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
+cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
+cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
+cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
 
 # Create the files specifying offset and size of the initrd
-perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off"
-perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
+perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
+perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
 
 cp "$DI_DIR/MANIFEST.udebs" .
 list_kernel_abis $images_S390 | check_kernel_sync
 
 # Copy the different boot files
-# - d390.ins    : for booting from CD-ROM or FTP-Server
-cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
-sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
-
-# Copy the README file
-cp $BASEDIR/data/$DI_CODENAME/$ARCH/README.boot "boot$N/"
+# - ubuntu.ins    : for booting from CD-ROM or FTP-Server
+# - README
+cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
 
 # Include the boot$N/-tree into the iso-image
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"