Skip to content

Commit 72fe98a

Browse files
committed
fix: boot with GRUB
The problem is that xfs with 6.18 LTS settings is not supported by GRUB yet. It might be supported with newly released 2.14 though. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent d4ed13d commit 72fe98a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pkg/machinery/imager/quirks/quirks.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,9 @@ func (q Quirks) XFSMkfsConfig() string {
250250
// if the version doesn't parse, we assume it's latest Talos
251251
// update when we have a new LTS config
252252
case version == nil:
253-
return "/usr/share/xfsprogs/mkfs/lts_6.18.conf"
253+
// [TODO]: lts_6.18.config doesn't work with GRUB, it doesn't recognize the xfs filesystem.
254+
return "/usr/share/xfsprogs/mkfs/lts_6.12.conf"
254255
// add new version once we have a new LTS config
255-
case version.GTE(semver.MustParse("1.13.0")):
256-
return "/usr/share/xfsprogs/mkfs/lts_6.18.conf"
257256
case version.GTE(semver.MustParse("1.10.0")):
258257
return "/usr/share/xfsprogs/mkfs/lts_6.12.conf"
259258
case version.GTE(semver.MustParse("1.8.0")) && version.LT(semver.MustParse("1.10.0")):

pkg/machinery/imager/quirks/quirks_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ func TestXFSMkfsConfigFile(t *testing.T) {
169169
},
170170
{
171171
version: "1.13.0",
172-
expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
172+
expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
173173
},
174174
{
175-
expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
175+
expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
176176
},
177177
} {
178178
t.Run(test.version, func(t *testing.T) {

0 commit comments

Comments
 (0)