45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
From 34845fefc2ef86537713138b657ea6b4969e6d0a Mon Sep 17 00:00:00 2001
|
|
From: Micah Abbott <miabbott@redhat.com>
|
|
Date: Fri, 7 Dec 2018 09:24:23 +0100
|
|
Subject: [PATCH] silverblue: Adjust ostree ref name for f29+
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Versions of Fedora Silverblue from 29 onward will use an ostree ref
|
|
name in the format `fedora/<version>/<arch>/silverblue` instead of
|
|
`fedora/<version>/<arch>/workstation`
|
|
|
|
Ref: https://pagure.io/pungi-fedora/pull-request/640
|
|
https://pagure.io/teamsilverblue/issue/29
|
|
|
|
Signed-off-by: Micah Abbott <miabbott@redhat.com>
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
---
|
|
.../fedoraproject.org/silverblue-kickstart-desktop.xml | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml b/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
|
|
index 80fe29f..b3f9cdf 100644
|
|
--- a/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
|
|
+++ b/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
|
|
@@ -59,7 +59,14 @@ 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
|
|
|
|
+<xsl:choose>
|
|
+ <xsl:when test="os/version < 29">
|
|
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
|
|
+ </xsl:when>
|
|
+ <xsl:otherwise>
|
|
+ostreesetup --osname="fedora-silverblue" --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
|
|
+ </xsl:otherwise>
|
|
+</xsl:choose>
|
|
graphical
|
|
reboot
|
|
|
|
--
|
|
2.19.1
|
|
|