Re: Improve support for genkernel in 10_linux

[Mike Gilbert <floppym@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 556 bytes --]

On 04/07/2012 05:54 PM, Mike Gilbert wrote:
> Secondly, genkernel looks for the "real_root" kernel command line option
> to determine the root filesystem. This is a holdover from the days when
> we used true initrd images and we needed to use root=/dev/ram0.
> 

It was brought to my attention that genkernel's initramfs code will in
fact utilize "root" if "real_root" is unset. This part of my previous
patch is therefore pointless.

I have attached a revised patch containing only the changes necessary to
detect a genkernel initramfs image.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: grub-2.00-genkernel.patch --]
[-- Type: text/x-patch; name="grub-2.00-genkernel.patch", Size: 1405 bytes --]

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-07 18:11:04 +0000
+++ ChangeLog	2012-04-11 02:53:02 +0000
@@ -1,3 +1,7 @@
+2012-04-10  Mike Gilbert  <floppym@gentoo.org>
+
+	* util/grub.d/10_linux.in: Fix detection of genkernel initramfs.
+
 2012-04-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/charset.c (grub_ucs4_to_utf8): Return number of

=== modified file 'util/grub.d/10_linux.in'
--- util/grub.d/10_linux.in	2012-03-10 14:21:25 +0000
+++ util/grub.d/10_linux.in	2012-04-11 02:32:46 +0000
@@ -182,17 +182,19 @@
   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
   initrd=
+  pushd "${dirname}" > /dev/null
   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
 	   "initrd-${version}" "initramfs-${version}.img" \
 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-	   "initramfs-genkernel-${version}" \
-	   "initramfs-genkernel-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
+	   "initramfs-genkernel"*"-${version}" \
+	   "initramfs-genkernel"*"-${alt_version}"; do
+    if test -e "${i}" ; then
       initrd="$i"
       break
     fi
   done
+  popd > /dev/null
 
   config=
   for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 230 bytes --]