debian-cd

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

  1. deprecate-di
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2048
Proposed branch: lp:~xnox/debian-cd/deprecate-di
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 55 lines (+5/-5)
4 files modified
tools/boot/focal/boot-amd64 (+1/-1)
tools/boot/focal/boot-arm64 (+1/-1)
tools/boot/focal/boot-ppc64el (+2/-2)
tools/boot/focal/boot-s390x (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/deprecate-di
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+381236@code.launchpad.net

Commit message

Use deprecated-images path for d-i in focal, matching https://code.launchpad.net/~xnox/debian-installer/deprecated-ubuntu/+merge/381214

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Depends on d-i merge first, and must match paths there.

lp:~xnox/debian-cd/deprecate-di updated
2046. By Dimitri John Ledkov

Use classic-images path for focal d-i

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

d-i is merged, and is now in unapproved

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/focal/boot-amd64'
2--- tools/boot/focal/boot-amd64 2020-04-01 10:28:48 +0000
3+++ tools/boot/focal/boot-amd64 2020-04-09 20:24:19 +0000
4@@ -107,7 +107,7 @@
5 dir=$(dirname $image)
6 mkdir -p $dir
7 if [ ! "$DI_WWW_HOME" ];then
8- cp "$DI_PATH/current/images/$image" "$image"
9+ cp "$DI_PATH/current/classic-images/$image" "$image"
10 else
11 wget "$DI_WWW_HOME/$image" -O "$image"
12 fi
13
14=== modified file 'tools/boot/focal/boot-arm64'
15--- tools/boot/focal/boot-arm64 2020-02-18 17:37:38 +0000
16+++ tools/boot/focal/boot-arm64 2020-04-09 20:24:19 +0000
17@@ -84,7 +84,7 @@
18 dir=$(dirname $image)
19 mkdir -p $dir
20 if [ ! "$DI_WWW_HOME" ];then
21- cp "$DI_PATH/current/images/$image" "$image"
22+ cp "$DI_PATH/current/classic-images/$image" "$image"
23 else
24 wget "$DI_WWW_HOME/$image" -O "$image"
25 fi
26
27=== modified file 'tools/boot/focal/boot-ppc64el'
28--- tools/boot/focal/boot-ppc64el 2020-02-18 17:37:38 +0000
29+++ tools/boot/focal/boot-ppc64el 2020-04-09 20:24:19 +0000
30@@ -84,10 +84,10 @@
31 done
32
33 (cd $CDDIR/..;
34- cp -a "$DI_PATH/current/images/MANIFEST.udebs" .
35+ cp -a "$DI_PATH/current/classic-images/MANIFEST.udebs" .
36 list_kernel_abis $BOOT_IMAGES | check_kernel_sync)
37
38-DI_DIR="$DI_PATH/current/images"
39+DI_DIR="$DI_PATH/current/classic-images"
40 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
41 for kp in $KERNEL_PREFIXES; do
42 cp -lf "$DI_DIR/${!kp}cdrom/vmlinux" "$CDDIR/install/${!kp}vmlinux"
43
44=== modified file 'tools/boot/focal/boot-s390x'
45--- tools/boot/focal/boot-s390x 2019-10-18 23:26:51 +0000
46+++ tools/boot/focal/boot-s390x 2020-04-09 20:24:19 +0000
47@@ -42,7 +42,7 @@
48
49 imagedir="boot$N/boot"
50 mkdir -p $imagedir
51-DI_DIR="$DI_PATH/current/images"
52+DI_DIR="$DI_PATH/current/classic-images"
53
54 cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
55 sed -e 's/boot from CD-ROM or FTP-Server/default kernel/' \

Subscribers

People subscribed via source and target branches