Merge ~seb128/debian-cd:main into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 040ad07107382d49da987a2c46a49685e44adb6f
Proposed branch: ~seb128/debian-cd:main
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 13 lines (+1/-1)
1 file modified
tools/boot/lunar/boot-amd64 (+1/-1)
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+433505@code.launchpad.net

Description of the change

the current desktop amd64 ISO build fails on

> tar: ./boot/memtest86+.bin: Not found in archive

which is a consequence of memtest86+ update in lunar which replaced that file by /boot/memtest86+x32.bin and /boot/memtest86+x64.bin

The change installs the new x64 bin since that's what is matching the architecture

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Yeah, this looks good to me, fits what memtest86+ did. Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/boot/lunar/boot-amd64 b/tools/boot/lunar/boot-amd64
2index 9293d98..f9a77a3 100755
3--- a/tools/boot/lunar/boot-amd64
4+++ b/tools/boot/lunar/boot-amd64
5@@ -41,7 +41,7 @@ dpkg --fsys-tarfile cd-boot-images-amd64*_all.deb | tar xf - -C cd-boot-images
6 mkdir memtest86+
7 $BASEDIR/tools/apt-selection download memtest86+
8 dpkg --fsys-tarfile memtest86+*_amd64.deb \
9- | tar xf - -C $CDDIR ./boot/memtest86+.bin
10+ | tar xf - -C $CDDIR ./boot/memtest86+x64.bin
11
12 mkisofs_opts ()
13 {

Subscribers

People subscribed via source and target branches