From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F4AC138334 for ; Tue, 15 Jan 2019 20:09:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 836FEE0A7F; Tue, 15 Jan 2019 20:09:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AB17E0A7F for ; Tue, 15 Jan 2019 20:09:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 410AE335CA6 for ; Tue, 15 Jan 2019 20:09:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D00D514 for ; Tue, 15 Jan 2019 20:09:41 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1547582961.ce554ac9b89fe1b724b135bcc57580e9eed1273f.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: ce554ac9b89fe1b724b135bcc57580e9eed1273f X-VCS-Branch: master Date: Tue, 15 Jan 2019 20:09:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86fe676a-186a-42f6-b606-01cb27c56f5e X-Archives-Hash: 5bd5c96ba0d6c2c934fb80c4de1c97f3 commit: ce554ac9b89fe1b724b135bcc57580e9eed1273f Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Jan 15 20:09:21 2019 +0000 Commit: Rick Farina gentoo org> CommitDate: Tue Jan 15 20:09:21 2019 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ce554ac9 fix memtest86 for legacy the cdtar replacement code appears to be copying the wrong memtest file per testing from iamben Signed-off-by: Rick Farina (Zero_Chaos) gentoo.org> targets/support/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 54455210..836dc9cc 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -94,9 +94,9 @@ create_bootloader() { fi #memtest goes under isolinux since it doesn't work for uefi right now if [ -f /usr/share/memtest86+/memtest ]; then - cp /usr/share/memtest86+/memtest isolinux/memtest86 + cp /usr/share/memtest86+/memtest.bin isolinux/memtest86 else - 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" + 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" fi else 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"