X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from dal-a2.localdomain (unknown [74.117.189.115]) by mail.alpinelinux.org (Postfix) with ESMTP id 9D181DC0091 for ; Fri, 28 Jun 2013 14:40:04 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (3.203.202.84.customer.cdi.no [84.202.203.3]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: ncopa@tanael.org) by dal-a2.localdomain (Postfix) with ESMTPSA id CD707BC2A9C; Fri, 28 Jun 2013 14:40:03 +0000 (UTC) Date: Fri, 28 Jun 2013 16:40:00 +0200 From: Natanael Copa To: Dubiousjim Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH 1/8] main/syslinux: fix/refactor initramfs Message-ID: <20130628164000.306a7674@ncopa-desktop.alpinelinux.org> In-Reply-To: References: X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.17; x86_64-unknown-linux-gnu) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 27 Jun 2013 03:32:14 -0400 Dubiousjim 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 > @@ -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) > @@ -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 > @@ -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@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---