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

[Dimitri John Ledkov]

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

1925. By Dimitri John Ledkov on 2015-12-16

Simply do a bunch of cp commands

=== modified file 'tools/boot/xenial/boot-s390x'
--- tools/boot/xenial/boot-s390x	2015-12-11 22:24:33 +0000
+++ tools/boot/xenial/boot-s390x	2015-12-16 19:51:02 +0000
@@ -20,6 +20,7 @@
 . $BASEDIR/tools/boot/$DI_CODENAME/common.sh
 
 set -e
+set -x
 
 N=$1
 CDDIR=$2
@@ -30,9 +31,6 @@
 if [ -z "$DI_PATH" ]; then
    DI_PATH="$($BASEDIR/tools/find-newest-installer)"
 fi
-if [ ! "$DI_DIR" ];then
-   DI_DIR="$DI_PATH/current/images"
-fi
 
 default_preseed
 default_language
@@ -55,38 +53,33 @@
 # - generic/initrd.debian      : initrd; to be used for both VM-reader
 # - generic/kernel.debian      : kernel for WM-reader
 
-images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
-
-for image in $images_S390; do
-	case $image in
-		generic/parmfile.debian)
-			imagedest=parmfile ;;
-		generic/initrd.debian)
-			imagedest=root.bin ;;
-		generic/kernel.debian)
-			imagedest=linux_vm ;;
-	esac
-	imagedest="$imagedir/$imagedest"
-
-	cp "$DI_DIR/$image" "$imagedest"
-done
+DI_DIR="$DI_PATH/current/images"
+mkdir -p $CDDIR/boot
+cp -lf "$DI_DIR/generic/parmfile.debian" "$CDDIR/boot/parmfile"
+cp -lf "$DI_DIR/generic/initrd.debian" "$CDDIR/boot/root.bin"
+cp -lf "$DI_DIR/generic/kernel.debian" "$CDDIR/boot/linux_vm"
+
+mkdir -p $CDDIR/install
+cp -lf "$DI_DIR/generic/debian.exec" $CDDIR/install/
+cp -lf "$DI_DIR/generic/parmfile.debian" $CDDIR/install/
+cp -lf "$DI_DIR/generic/initrd.debian" $CDDIR/install/
+cp -lf "$DI_DIR/generic/kernel.debian" $CDDIR/install/
+
+# Create the files specifying offset and size of the initrd
+perl -e "print pack('N', 0x1000000)" >"$CDDIR/boot/root.off"
+perl -e "print pack('N', -s '$CDDIR/boot/root.bin')" >"$CDDIR/boot/root.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
-# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
 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', 0x1000000)" >"$imagedir/root.off"
-perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
-
 # Copy the README file
 cp $BASEDIR/data/$DI_CODENAME/$ARCH/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "boot$N"