debian-cd

Merge lp:~vorlon/debian-cd/lp.1899615 into lp:~ubuntu-cdimage/debian-cd/ubuntu

  1. lp.1899615
  2. Merge into ubuntu
Proposed by Steve Langasek
Status: Merged
Merged at revision: 2095
Proposed branch: lp:~vorlon/debian-cd/lp.1899615
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 26 lines (+10/-0)
1 file modified
tools/boot/groovy/boot-amd64 (+10/-0)
To merge this branch: bzr merge lp:~vorlon/debian-cd/lp.1899615
Reviewer Review Type Date Requested Status
Iain Lane Approve
Dimitri John Ledkov (community) Approve
Review via email: mp+392638@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve
Revision history for this message
Iain Lane (laney) wrote :

Nice

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

star is needed there.... as laney pointing out.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/groovy/boot-amd64'
2--- tools/boot/groovy/boot-amd64 2020-10-16 22:59:54 +0000
3+++ tools/boot/groovy/boot-amd64 2020-10-21 23:38:43 +0000
4@@ -37,6 +37,12 @@
5 $BASEDIR/tools/apt-selection download cd-boot-images-amd64
6 dpkg --fsys-tarfile cd-boot-images-amd64*_all.deb | tar xf - -C cd-boot-images
7
8+# download, extract and include memtest86+
9+mkdir memtest86+
10+$BASEDIR/tools/apt-selection download memtest86+
11+dpkg --fsys-tarfile memtest86+_amd64.deb \
12+ | tar xf - -C $CDDIR ./boot/memtest86+.bin
13+
14 mkisofs_opts ()
15 {
16 printf "%s " $@ >> $N.mkisofs_opts
17@@ -176,6 +182,10 @@
18 menuentry 'UEFI Firmware Settings' {
19 fwsetup
20 }
21+else
22+menuentry 'Test memory' {
23+ linux16 /boot/memtest86+.bin
24+}
25 fi
26 EOF
27

Subscribers

People subscribed via source and target branches