Mail archive
alpine-devel

Re: [alpine-devel] [PATCH 1/8] main/syslinux: fix/refactor initramfs

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Fri, 28 Jun 2013 16:40:00 +0200

On Thu, 27 Jun 2013 03:32:14 -0400
Dubiousjim <dubiousjim_at_gmail.com> wrote:

> If xen.gz is present, there are multiple kernels, and later ones lack an
> initramfs, they'll currently be (wrongly) configured to use a initramfs anyway.
> Fixed.
>
> We also refactor the check for /boot/initramfs-$tag, and configure this using a
> separate INITRD line, instead of adding it to the APPEND line. In passing, this
> also closes a second might-use-a-stale-initramfs bug.
> ---
> main/syslinux/update-extlinux | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)

Looks good to me.

I'll apply unless someone nack it.

> diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
> index a4d4fa7..2b980a9 100755
> --- a/main/syslinux/update-extlinux
> +++ b/main/syslinux/update-extlinux
> _at_@ -91,6 +91,8 @@ if [ -f "/boot/xen.gz" ]; then
> if [ -f "/boot/initramfs-$tag" ]; then
> everbose "Found initramfs: /boot/initramfs-$tag"
> initramfs="initramfs-$tag"
> + else
> + initramfs=
> fi
> label=xen-$(grep -w -l $tag /usr/share/kernel/*/kernel.release \
> | cut -d/ -f5)
> _at_@ -113,11 +115,6 @@ fi
> for kernel in $(find /boot -name "vmlinuz-*" -type f); do
> tag=$(basename $kernel | cut -b9-)
> everbose "Found kernel: $kernel"
> -
> - if [ -f "/boot/initramfs-$tag" ]; then
> - everbose "Found initramfs: /boot/initramfs-$tag"
> - initramfs="initrd=initramfs-$tag"
> - fi
> label=$(grep -w -l $tag /usr/share/kernel/*/kernel.release | cut -d/ -f5)
> if [ -z "$label" ]; then
> label=$lst
> _at_@ -128,7 +125,11 @@ for kernel in $(find /boot -name "vmlinuz-*" -type f); do
> fi
> echo " MENU LABEL Linux $tag" >> $conf.new
> echo " KERNEL $(basename $kernel)" >> $conf.new
> - echo " APPEND $initramfs root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts" >> $conf.new
> + if [ -f "/boot/initramfs-$tag" ]; then
> + everbose "Found initramfs: /boot/initramfs-$tag"
> + echo " INITRD initramfs-$tag" >> $conf.new
> + fi
> + echo " APPEND root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts" >> $conf.new
> echo "" >> $conf.new
> lst=$(($lst + 1))
> done



---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Fri Jun 28 2013 - 16:40:00 UTC