| 1 |
floppym 12/04/07 21:33:13 |
| 2 |
|
| 3 |
Added: grub-2.00-10_linux-genkernel.patch |
| 4 |
Log: |
| 5 |
Add patch to support genkernel initramfs in 10_linux. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: grub-2.00-10_linux-genkernel.patch |
| 16 |
=================================================================== |
| 17 |
=== modified file 'util/grub.d/10_linux.in' |
| 18 |
--- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000 |
| 19 |
+++ util/grub.d/10_linux.in 2012-04-07 21:24:06 +0000 |
| 20 |
@@ -135,7 +135,7 @@ |
| 21 |
message="$(gettext_printf "Loading Linux %s ..." ${version})" |
| 22 |
sed "s/^/$submenu_indentation/" << EOF |
| 23 |
echo '$message' |
| 24 |
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} |
| 25 |
+ linux ${rel_dirname}/${basename} ${rootcmd}=${linux_root_device_thisversion} ro ${args} |
| 26 |
EOF |
| 27 |
if test -n "${initrd}" ; then |
| 28 |
# TRANSLATORS: ramdisk isn't identifier. Should be translated. |
| 29 |
@@ -181,19 +181,31 @@ |
| 30 |
alt_version=`echo $version | sed -e "s,\.old$,,g"` |
| 31 |
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" |
| 32 |
|
| 33 |
+ rootcmd=root |
| 34 |
initrd= |
| 35 |
+ pushd "${dirname}" > /dev/null |
| 36 |
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ |
| 37 |
"initrd-${version}" "initramfs-${version}.img" \ |
| 38 |
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \ |
| 39 |
- "initrd-${alt_version}" "initramfs-${alt_version}.img" \ |
| 40 |
- "initramfs-genkernel-${version}" \ |
| 41 |
- "initramfs-genkernel-${alt_version}"; do |
| 42 |
- if test -e "${dirname}/${i}" ; then |
| 43 |
+ "initrd-${alt_version}" "initramfs-${alt_version}.img"; do |
| 44 |
+ if test -e "${i}" ; then |
| 45 |
initrd="$i" |
| 46 |
break |
| 47 |
fi |
| 48 |
done |
| 49 |
|
| 50 |
+ if [ "x$initrd" = x ]; then |
| 51 |
+ for i in "initramfs-genkernel"*"-${version}" \ |
| 52 |
+ "initramfs-genkernel"*"-${alt_version}"; do |
| 53 |
+ if test -e "${i}"; then |
| 54 |
+ initrd="$i" |
| 55 |
+ rootcmd=real_root |
| 56 |
+ break |
| 57 |
+ fi |
| 58 |
+ done |
| 59 |
+ fi |
| 60 |
+ popd > /dev/null |
| 61 |
+ |
| 62 |
config= |
| 63 |
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do |
| 64 |
if test -e "${i}" ; then |
Archives