From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (unknown [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id C429C60167 for ; Wed, 21 May 2014 17:43:08 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 21 May 2014 10:37:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.98,881,1392192000"; d="scan'208";a="544377036" Received: from hdang1-mobl.amr.corp.intel.com ([10.254.54.44]) by orsmga002.jf.intel.com with ESMTP; 21 May 2014 10:42:54 -0700 Message-ID: <537CE5CB.8030402@linux.intel.com> Date: Wed, 21 May 2014 10:43:39 -0700 From: Darren Hart User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: rongqing.li@windriver.com, openembedded-core@lists.openembedded.org References: <1400554188-19458-1-git-send-email-rongqing.li@windriver.com> In-Reply-To: <1400554188-19458-1-git-send-email-rongqing.li@windriver.com> Subject: Re: [PATCH 1/2] initramfs-live-install: avoid using grub.d/40_custom X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 17:43:11 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 5/19/14, 19:49, rongqing.li@windriver.com wrote: > From: Robert Yang Hi Robert, Just to clarify - there is no Patch 2/2 right? > We have this in recipes-bsp/grub/grub/40_custom: > > [snip] > menuentry "Linux" { > set root=(hd0,1) > linux /vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet > } > [snip] > > These lines are only for initrdscripts/files/init-install.sh, the side > effect is that it would make the target's grub-mkconfig doesn't work > well since the 40_custom will be installed to /etc/grub.d/40_custom, the > grub-mkconfig will run the 40_custom, and there will always be a > 'menuentry "Linux"' menu in grub.cfg no matter it is valid or not, we > can do this in init-install.sh rather than grub to fix the problem, > which is also much simpler. > > Signed-off-by: Robert Yang > --- > meta/recipes-core/initrdscripts/files/init-install.sh | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh > index 8e433d5..0ede928 100644 > --- a/meta/recipes-core/initrdscripts/files/init-install.sh > +++ b/meta/recipes-core/initrdscripts/files/init-install.sh > @@ -168,17 +168,16 @@ umount /src_root > # Handling of the target boot partition > mount $bootfs /boot > echo "Preparing boot partition..." > -if [ -f /etc/grub.d/40_custom ] ; then > +if [ -f /etc/grub.d/00_header ] ; then > echo "Preparing custom grub2 menu..." > GRUBCFG="/boot/grub/grub.cfg" > mkdir -p $(dirname $GRUBCFG) > - cp /etc/grub.d/40_custom $GRUBCFG > - sed -i "s@__ROOTFS__@$rootfs $rootwait@g" $GRUBCFG > - sed -i "s/__VIDEO_MODE__/$3/g" $GRUBCFG > - sed -i "s/__VGA_MODE__/$4/g" $GRUBCFG > - sed -i "s/__CONSOLE__/$5/g" $GRUBCFG > - sed -i "/#/d" $GRUBCFG > - sed -i "/exec tail/d" $GRUBCFG > + cat >$GRUBCFG <<_EOF > +menuentry "Linux" { > + set root=(hd0,1) > + linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet > +} > +_EOF OK, seems like a reasonable incremental change. What becomes of the 40_custom file itself? Should that be removed from the grub recipe as well? Does the BSP variable "APPEND" get incorporated here anywhere? It's looking like it isn't - or maybe I'm missing it? Thanks, -- Darren Hart Open Source Technology Center darren.hart@intel.com Intel Corporation