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

Proposed by Dimitri John Ledkov on 2015-12-16
Status: Merged
Merged at revision: 1925
Proposed branch: lp:~xnox/debian-cd/s390x
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 76 lines (+17/-24)
1 file modified
tools/boot/xenial/boot-s390x (+17/-24)
To merge this branch: bzr merge lp:~xnox/debian-cd/s390x
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team 2015-12-16 Pending
Review via email: mp+280757@code.launchpad.net
To post a comment you must log in.
lp:~xnox/debian-cd/s390x updated on 2015-12-16
1925. By Dimitri John Ledkov on 2015-12-16

Simply do a bunch of cp commands

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/xenial/boot-s390x'
2--- tools/boot/xenial/boot-s390x 2015-12-11 22:24:33 +0000
3+++ tools/boot/xenial/boot-s390x 2015-12-16 19:51:02 +0000
4@@ -20,6 +20,7 @@
5 . $BASEDIR/tools/boot/$DI_CODENAME/common.sh
6
7 set -e
8+set -x
9
10 N=$1
11 CDDIR=$2
12@@ -30,9 +31,6 @@
13 if [ -z "$DI_PATH" ]; then
14 DI_PATH="$($BASEDIR/tools/find-newest-installer)"
15 fi
16-if [ ! "$DI_DIR" ];then
17- DI_DIR="$DI_PATH/current/images"
18-fi
19
20 default_preseed
21 default_language
22@@ -55,38 +53,33 @@
23 # - generic/initrd.debian : initrd; to be used for both VM-reader
24 # - generic/kernel.debian : kernel for WM-reader
25
26-images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
27-
28-for image in $images_S390; do
29- case $image in
30- generic/parmfile.debian)
31- imagedest=parmfile ;;
32- generic/initrd.debian)
33- imagedest=root.bin ;;
34- generic/kernel.debian)
35- imagedest=linux_vm ;;
36- esac
37- imagedest="$imagedir/$imagedest"
38-
39- cp "$DI_DIR/$image" "$imagedest"
40-done
41+DI_DIR="$DI_PATH/current/images"
42+mkdir -p $CDDIR/boot
43+cp -lf "$DI_DIR/generic/parmfile.debian" "$CDDIR/boot/parmfile"
44+cp -lf "$DI_DIR/generic/initrd.debian" "$CDDIR/boot/root.bin"
45+cp -lf "$DI_DIR/generic/kernel.debian" "$CDDIR/boot/linux_vm"
46+
47+mkdir -p $CDDIR/install
48+cp -lf "$DI_DIR/generic/debian.exec" $CDDIR/install/
49+cp -lf "$DI_DIR/generic/parmfile.debian" $CDDIR/install/
50+cp -lf "$DI_DIR/generic/initrd.debian" $CDDIR/install/
51+cp -lf "$DI_DIR/generic/kernel.debian" $CDDIR/install/
52+
53+# Create the files specifying offset and size of the initrd
54+perl -e "print pack('N', 0x1000000)" >"$CDDIR/boot/root.off"
55+perl -e "print pack('N', -s '$CDDIR/boot/root.bin')" >"$CDDIR/boot/root.siz"
56
57 cp "$DI_DIR/MANIFEST.udebs" .
58 list_kernel_abis $images_S390 | check_kernel_sync
59
60 # Copy the different boot files
61 # - d390.ins : for booting from CD-ROM or FTP-Server
62-# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
63 cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
64 sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
65
66-# Create the files specifying offset and size of the initrd
67-perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off"
68-perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
69-
70 # Copy the README file
71 cp $BASEDIR/data/$DI_CODENAME/$ARCH/README.boot "boot$N/"
72
73 # Include the boot$N/-tree into the iso-image
74 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
75-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
76+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "boot$N"

Subscribers

People subscribed via source and target branches