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 389211382FE for ; Sun, 10 Jul 2016 02:48:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3619E0B26; Sun, 10 Jul 2016 02:48:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61028E0B26 for ; Sun, 10 Jul 2016 02:48:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C0A8340F7D for ; Sun, 10 Jul 2016 02:48:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 125F32416 for ; Sun, 10 Jul 2016 02:48:38 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1468118903.0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/memtest86+/files/39_memtest86+ sys-apps/memtest86+/memtest86+-4.20-r2.ebuild sys-apps/memtest86+/memtest86+-4.20-r3.ebuild sys-apps/memtest86+/memtest86+-5.01-r1.ebuild sys-apps/memtest86+/memtest86+-5.01-r2.ebuild X-VCS-Directories: sys-apps/memtest86+/ sys-apps/memtest86+/files/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f X-VCS-Branch: master Date: Sun, 10 Jul 2016 02:48:38 +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-Archives-Salt: 443ca718-caef-4f0e-a8c9-6db839e53c94 X-Archives-Hash: 383c34b3d66e08f8c118cecf23ec5f82 commit: 0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f Author: NP-Hardass gentoo org> AuthorDate: Sat May 14 22:40:28 2016 +0000 Commit: NP Hardass gentoo org> CommitDate: Sun Jul 10 02:48:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb2ba9f sys-apps/memtest86+: Update 39_memtest86+ to support grub submenus Package-Manager: portage-2.2.28 sys-apps/memtest86+/files/39_memtest86+ | 59 ++++++++++++++++++---- ...6+-4.20-r2.ebuild => memtest86+-4.20-r3.ebuild} | 2 +- ...6+-5.01-r1.ebuild => memtest86+-5.01-r2.ebuild} | 2 +- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+ index 14f27a2..10e1964 100644 --- a/sys-apps/memtest86+/files/39_memtest86+ +++ b/sys-apps/memtest86+/files/39_memtest86+ @@ -4,30 +4,67 @@ memtest=/boot/memtest86plus/memtest +memtestbsd=/boot/memtest86plus/memtest.netbsd + +if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then + multiple_memtest=true +fi + +submenu_indentation="" +if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then + submenu_indentation="${grub_tab}" + cat <&2 + device="$("${grub_probe}" --target=device "${memtest}")" path="$(make_system_path_relative_to_its_root "${memtest}")" cat <&2 + + device="$("${grub_probe}" --target=device "${memtestbsd}")" + path="$(make_system_path_relative_to_its_root "${memtestbsd}")" cat <