debian-cd

Merge lp:~xnox/debian-cd/update-boot-scripts into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. update-boot-scripts
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Iain Lane
Approved revision: 2050
Merged at revision: 2050
Proposed branch: lp:~xnox/debian-cd/update-boot-scripts
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/update-boot-scripts
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+382277@code.launchpad.net

Commit message

Use legacy names

Description of the change

Use legacy names

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64 2020-04-09 20:51:06 +0000
+++ tools/boot/focal/boot-amd64 2020-04-15 09:18:38 +0000
@@ -107,7 +107,7 @@
107 dir=$(dirname $image)107 dir=$(dirname $image)
108 mkdir -p $dir108 mkdir -p $dir
109 if [ ! "$DI_WWW_HOME" ];then109 if [ ! "$DI_WWW_HOME" ];then
110 cp "$DI_PATH/current/classic-images/$image" "$image"110 cp "$DI_PATH/current/legacy-images/$image" "$image"
111 else111 else
112 wget "$DI_WWW_HOME/$image" -O "$image"112 wget "$DI_WWW_HOME/$image" -O "$image"
113 fi113 fi
114114
=== modified file 'tools/boot/focal/boot-arm64'
--- tools/boot/focal/boot-arm64 2020-04-09 20:23:49 +0000
+++ tools/boot/focal/boot-arm64 2020-04-15 09:18:38 +0000
@@ -84,7 +84,7 @@
84 dir=$(dirname $image)84 dir=$(dirname $image)
85 mkdir -p $dir85 mkdir -p $dir
86 if [ ! "$DI_WWW_HOME" ];then86 if [ ! "$DI_WWW_HOME" ];then
87 cp "$DI_PATH/current/classic-images/$image" "$image"87 cp "$DI_PATH/current/legacy-images/$image" "$image"
88 else88 else
89 wget "$DI_WWW_HOME/$image" -O "$image"89 wget "$DI_WWW_HOME/$image" -O "$image"
90 fi90 fi
9191
=== modified file 'tools/boot/focal/boot-ppc64el'
--- tools/boot/focal/boot-ppc64el 2020-04-09 20:23:49 +0000
+++ tools/boot/focal/boot-ppc64el 2020-04-15 09:18:38 +0000
@@ -84,10 +84,10 @@
84done84done
8585
86(cd $CDDIR/..;86(cd $CDDIR/..;
87 cp -a "$DI_PATH/current/classic-images/MANIFEST.udebs" .87 cp -a "$DI_PATH/current/legacy-images/MANIFEST.udebs" .
88 list_kernel_abis $BOOT_IMAGES | check_kernel_sync)88 list_kernel_abis $BOOT_IMAGES | check_kernel_sync)
8989
90DI_DIR="$DI_PATH/current/classic-images"90DI_DIR="$DI_PATH/current/legacy-images"
91if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then91if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
92for kp in $KERNEL_PREFIXES; do92for kp in $KERNEL_PREFIXES; do
93 cp -lf "$DI_DIR/${!kp}cdrom/vmlinux" "$CDDIR/install/${!kp}vmlinux"93 cp -lf "$DI_DIR/${!kp}cdrom/vmlinux" "$CDDIR/install/${!kp}vmlinux"
9494
=== modified file 'tools/boot/focal/boot-s390x'
--- tools/boot/focal/boot-s390x 2020-04-09 20:23:49 +0000
+++ tools/boot/focal/boot-s390x 2020-04-15 09:18:38 +0000
@@ -42,7 +42,7 @@
4242
43imagedir="boot$N/boot"43imagedir="boot$N/boot"
44mkdir -p $imagedir44mkdir -p $imagedir
45DI_DIR="$DI_PATH/current/classic-images"45DI_DIR="$DI_PATH/current/legacy-images"
4646
47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
48sed -e 's/boot from CD-ROM or FTP-Server/default kernel/' \48sed -e 's/boot from CD-ROM or FTP-Server/default kernel/' \

Subscribers

People subscribed via source and target branches