[Libosinfo] [PATCH] silverblue: fix ostree ref name

[Fabiano Fidêncio]

On Thu, Dec 6, 2018 at 12:57 PM Fabiano Fidêncio <fidencio at redhat.com> wrote:
>
> Micah,
>
> On Thu, Dec 6, 2018 at 11:18 AM Daniel P. Berrangé <berrange at redhat.com> wrote:
> >
> > On Wed, Dec 05, 2018 at 03:51:44PM -0500, Micah Abbott wrote:
> > > Versions of Fedora Silverblue from 29 onward will use an ostree ref
> > > name in the format `fedora/<version>/<arch>/silverblue`
> > >
> > > Ref:  https://pagure.io/pungi-fedora/pull-request/640
> > >       https://pagure.io/teamsilverblue/issue/29
> > >
> > > Signed-off-by: Micah Abbott <miabbott at redhat.com>
> > > ---
> > >  .../fedoraproject.org/silverblue-kickstart-desktop.xml.in       | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
> > > index 83cdd57..ad4182f 100644
> > > --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
> > > +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
> > > @@ -61,7 +61,7 @@ volgroup VolGroup00 --pesize=32768 pv.2
> > >  logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
> > >  logvol / --fstype xfs --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
> > >
> > > -ostreesetup --osname="fedora-workstation" --remote="fedora-<xsl:value-of select="os/version"/>" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/workstation" --nogpg
> > > +ostreesetup --osname="fedora-workstation" --remote="fedora-<xsl:value-of select="os/version"/>" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/silverblue" --nogpg
> > >  graphical
> > >  reboot
> >
> > The install scripts are shared between multiple versions of the distro,
> > so you can't simply change the content like this. You need todo a
> > conditional check on the version number to decide which value to use.
>
> An example of Daniel's comment would look like:
> <xsl:choose>
>   <xsl:when test="os/version < 29">
>    ... old content in here ...
>   </xsl:when>
>   <xsl:otherwise>
>    ... new content in here ...
>   </xsl:otherwise>
> </xsl:choose>

After talking to Micah, I've done the needed changes and I'm pushing
the patch without the need for Micah to submit a v2.
I made sure that express installations for both Silverblue28 and
Silverblue29 are working as expected (although rpm-ostree upgrade is
*really* slow).

Micah, thanks for the contribution!

Best Regards,
-- 
Fabiano Fidêncio