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

Jonathan Lebon jonathan.lebon at gmail.com
Wed Sep 5 13:55:21 UTC 2018


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
> ---
>  .../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
>




More information about the Libosinfo mailing list