Re: [PATCH OSSTEST v2] grub: remove patch to disable submenu from 20_linux_xen overlay

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-05-06 at 13:10 +0100, Wei Liu wrote:
> On Wed, May 06, 2015 at 11:41:11AM +0100, Ian Campbell wrote:
> > setupboot_grub2 now supports submenus, so we can reduce our delta vs
> > upstream a bit.
> > 
> > I started by extracting 20_linux_xen from
> > http://snapshot.debian.org/archive/debian/20130703T094657Z/pool/main/g/grub2/grub-common_1.99-27%2Bdeb7u2_amd64.deb
> > and then applying the patch at
> > http://savannah.gnu.org/file/grub.patch?file_id=32276 (the patch from
> > grub bug #42420 at http://savannah.gnu.org/bugs/?43420) and
> > reinstating the comment at the top of the file (modified to drop the
> > reference to the Debian bug.
> > 
> > This left me with some spurious changes:
> > 
> >     @@ -93,7 +93,7 @@ linux_entry ()
> >            if test ! -e "${xen_dirname}/${xenpolicy}" ; then
> >               return
> >            fi
> >     -      xen_args=`echo $xen_args flask=enforcing`
> >     +      xen_args=`echo $xen_args flask_enabled=1 flask_enforcing=1`
> 
> This is due to we changed flask command line option. The uploaded
> version used the old options.
> 
> >            if ${recovery} ; then
> >               title="$(gettext_quoted "%s, with Xen %s (XSM enabled) and Linux %s (recovery mode)")"
> >            else
> >     @@ -137,7 +137,6 @@ EOF
> >             echo    '$message'
> >             module  ${rel_dirname}/${xenpolicy}
> >      EOF
> >     -  fi
> 
> I don't really remember the exact detail of this "fi". But if the
> resulting file after reverting this "fi" looks correct to you then this
> is OK.

The resulting file is correct, I think the patch in the bug report has
an unclosed if in it.

> >        cat << EOF
> >      }
> >      EOF
> > 
> > I think these are bugs in the patch in the grub BTS, which were fixed
> > while iterating over the XSM series in osstest but didn't make it into
> > the upstream version, the fixes to those bugs are reverted byu the
> > above. So I have manually reverted them.
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Wei.Lui@citrix.com
> 
> Wrong email address. I wonder how this email arrived in my inbox. :-)

I also did "--cc wei" on my git send-email and your address is correct
in my ~/.gitaliases.

> 
> > Cc: longtaox.pang@intel.com
> > ---
> > v2: Posting as a standalone patch instead of in the nestedhvm series.
> > 
> > This should go in after "parsing grub which has 'submenu' primitive"
> > which is part of the nestedhvm test series from Longtao Pang. Needs
> > testing on top of that patch.
> > 
> > Wei, if you agree wrt those changes I'll update the bug, or perhaps
> > you want to?
> 
> Can you please do that since you have the most up to date patch at hand.
> Thanks!

Sure.