| 1 |
commit: 4bf27313d39ee0f7dbff576718cb855500d74fd9 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 5 13:53:50 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 5 13:53:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf27313 |
| 7 |
|
| 8 |
sys-boot/systemrescuecd-x86-grub: Fix path of ISO image. |
| 9 |
|
| 10 |
Also bump EAPI to 7. |
| 11 |
|
| 12 |
Non-maintainer commit. Acked by mgorny. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 15 |
|
| 16 |
sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub | 10 +++++----- |
| 17 |
...6-grub-0.1.ebuild => systemrescuecd-x86-grub-0.1-r1.ebuild} | 5 ++--- |
| 18 |
2 files changed, 7 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub |
| 21 |
index e9695c4b482..269b1eb76ad 100644 |
| 22 |
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub |
| 23 |
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
#!/bin/sh |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2018 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
. /usr/share/grub/grub-mkconfig_lib |
| 31 |
@@ -32,28 +32,28 @@ if [ -f "${srcd}" ]; then |
| 32 |
submenu "${longname}" --class submenu { |
| 33 |
menuentry "${longname} (32bit standard${bootops}" --class rescue { |
| 34 |
${grub_string} |
| 35 |
- set isofile=${srcd} |
| 36 |
+ set isofile=${path} |
| 37 |
loopback loop \${isofile} |
| 38 |
linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} |
| 39 |
initrd (loop)/isolinux/initram.igz |
| 40 |
} |
| 41 |
menuentry "${longname} (64bit standard${bootops}" --class rescue { |
| 42 |
${grub_string} |
| 43 |
- set isofile=${srcd} |
| 44 |
+ set isofile=${path} |
| 45 |
loopback loop \${isofile} |
| 46 |
linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} |
| 47 |
initrd (loop)/isolinux/initram.igz |
| 48 |
} |
| 49 |
menuentry "${longname} (32bit alternative${bootops}" --class rescue { |
| 50 |
${grub_string} |
| 51 |
- set isofile=${srcd} |
| 52 |
+ set isofile=${path} |
| 53 |
loopback loop \${isofile} |
| 54 |
linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} |
| 55 |
initrd (loop)/isolinux/initram.igz |
| 56 |
} |
| 57 |
menuentry "${longname} (64bit alternative${bootops}" --class rescue { |
| 58 |
${grub_string} |
| 59 |
- set isofile=${srcd} |
| 60 |
+ set isofile=${path} |
| 61 |
loopback loop \${isofile} |
| 62 |
linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} |
| 63 |
initrd (loop)/isolinux/initram.igz |
| 64 |
|
| 65 |
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild |
| 66 |
similarity index 92% |
| 67 |
rename from sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild |
| 68 |
rename to sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild |
| 69 |
index 3a5d11ae858..80a82041913 100644 |
| 70 |
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild |
| 71 |
+++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild |
| 72 |
@@ -1,7 +1,7 @@ |
| 73 |
-# Copyright 1999-2015 Gentoo Foundation |
| 74 |
+# Copyright 1999-2018 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
-EAPI=5 |
| 78 |
+EAPI=7 |
| 79 |
|
| 80 |
DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86" |
| 81 |
HOMEPAGE="http://www.sysresccd.org/" |
| 82 |
@@ -10,7 +10,6 @@ SRC_URI="" |
| 83 |
LICENSE="GPL-2" |
| 84 |
SLOT=0 |
| 85 |
KEYWORDS="~amd64 ~x86" |
| 86 |
-IUSE="" |
| 87 |
|
| 88 |
S=${WORKDIR} |
Archives