[Libosinfo] [PATCH 2/2] silverblue: Fix remote name typo

[Fabiano Fidêncio]

Jonathan,

On Wed, Sep 5, 2018 at 4:12 PM, Fabiano Fidêncio <fidencio at redhat.com> wrote:
> Jonathan,
>
> On Wed, Sep 5, 2018 at 3:55 PM, Jonathan Lebon <jonathan.lebon at gmail.com> wrote:
>> The commit message makes it seem like the only issue was the
>> `workstation` -> `worstation` typo, but the name in the
>> `%ostreesetup` line was also missing the `$releasever`
>> suffix.
>>
>> Also, I will note I didn't actually test this. Feel free to
>> hold until I can do so, though the changes are pretty
>> straightforward.
>> On Wed, Sep 5, 2018 at 9:44 AM Jonathan Lebon <jonathan at jlebon.com> wrote:
>>>
>>> The system is set up to expect a remote named `fedora-workstation`, but
>>> the remote file we install in `%post` had a typo (`fedora-worstation`).
>>> Fix this by just naming the remote `fedora-$releasever` since the OSTree
>>> repo is actually not specific to Fedora Silverblue.
>>>
>>> Ref: https://pagure.io/teamsilverblue/issue/29
>
> I'll give it a try later Today in order to be sure that the express
> installation works as expected and then I'll give the "ack" and merge
> the patch.
>
> Thanks a lot for the contribution!

I've tested your patches and they do work with the following patch
squashed to the this one:
[fidencio at dahmer osinfo-db]$ git diff
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 aa5c035..83cdd57 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -96,7 +96,7 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
 [debug]
 " > /etc/gdm/custom.conf

-rm -f /etc/ostree/remotes.d/fedora-workstation.conf
+rm -f /etc/ostree/remotes.d/fedora-'<xsl:value-of select="os/version"/>'.conf
 ostree remote add --if-not-exists
--set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-<xsl:value-of
select="os/version"/>-primary fedora-<xsl:value-of
select="os/version"/> 'https://dl.fedoraproject.org/atomic/repo/'

 %end


Previously we're creating the fedora-workstation.conf file during the
installation (pointing to file:///ostree/repo), removing it and then
re-creating it pointing to the correct remote URL.
After your patch, we create fedora-$releasever.conf instead of
fedora-workstation.conf and we have to remove the correct file
otherwise the `ostree remote add --if-not-exists` won't add the new
repo ...

Would you give me your ack to squash my patch into yours before pushing?

By the way, the way I tested was just by calling: `rpm-ostree upgrade`
after an express installation with Boxes (and it works!). Is it
enough?

>
>>> ---
>>>  .../fedoraproject.org/silverblue-kickstart-desktop.xml.in     | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> 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 026c4da..aa5c035 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-workstation" --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"/>/workstation" --nogpg
>>>  graphical
>>>  reboot
>>>
>>> @@ -97,7 +97,7 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
>>>  " > /etc/gdm/custom.conf
>>>
>>>  rm -f /etc/ostree/remotes.d/fedora-workstation.conf
>>> -ostree remote add --if-not-exists --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-<xsl:value-of select="os/version"/>-primary fedora-worstation-<xsl:value-of select="os/version"/> 'https://dl.fedoraproject.org/atomic/repo/'
>>> +ostree remote add --if-not-exists --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-<xsl:value-of select="os/version"/>-primary fedora-<xsl:value-of select="os/version"/> 'https://dl.fedoraproject.org/atomic/repo/'
>>>
>>>  %end
>>>         </xsl:template>
>>> --
>>> 2.17.1
>>>
>>
>> _______________________________________________
>> Libosinfo mailing list
>> Libosinfo at redhat.com
>> https://www.redhat.com/mailman/listinfo/libosinfo