Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Tue, 15 Jan 2019 20:09:47
Message-Id: 1547582961.ce554ac9b89fe1b724b135bcc57580e9eed1273f.zerochaos@gentoo
1 commit: ce554ac9b89fe1b724b135bcc57580e9eed1273f
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 15 20:09:21 2019 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 15 20:09:21 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ce554ac9
7
8 fix memtest86 for legacy
9
10 the cdtar replacement code appears to be copying the wrong memtest file
11 per testing from iamben
12
13 Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
14
15 targets/support/functions.sh | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/targets/support/functions.sh b/targets/support/functions.sh
19 index 54455210..836dc9cc 100755
20 --- a/targets/support/functions.sh
21 +++ b/targets/support/functions.sh
22 @@ -94,9 +94,9 @@ create_bootloader() {
23 fi
24 #memtest goes under isolinux since it doesn't work for uefi right now
25 if [ -f /usr/share/memtest86+/memtest ]; then
26 - cp /usr/share/memtest86+/memtest isolinux/memtest86
27 + cp /usr/share/memtest86+/memtest.bin isolinux/memtest86
28 else
29 - echo "Missing /usr/share/memtest86+/memtest, this livecd will not have memtest86+ support. Enable USE=system-bootloader on catalyst to pull in the correct deps"
30 + echo "Missing /usr/share/memtest86+/memtest.bin, this livecd will not have memtest86+ support. Enable USE=system-bootloader on catalyst to pull in the correct deps"
31 fi
32 else
33 echo "Missing /usr/share/syslinux/isolinux.bin, this livecd will not bios boot. Enable USE=system-bootloader on catalyst to pull in the correct deps"