feat: update GRUB to 2.14

smira · smira · commit a4f1c5239ef7 · 2026-01-22T22:35:18.000+04:00
It looks like xfs with modern 6.18 settings is supported with GRUB 2.14
now.

Signed-off-by: Andrey Smirnov &lt;andrey.smirnov@siderolabs.com&gt;
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ EMBED_TARGET ?= embed
 TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
 TOOLS ?= v1.13.0-alpha.0-8-g98c699e
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.13.0-alpha.0-35-g375983f
+PKGS ?= v1.13.0-alpha.0-37-g1b4fbf5
 GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
 GENERATE_VEX ?= latest
 
diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs
@@ -1 +1 @@
-v1.13.0-alpha.0-35-g375983f
+v1.13.0-alpha.0-37-g1b4fbf5
diff --git a/pkg/machinery/imager/quirks/quirks.go b/pkg/machinery/imager/quirks/quirks.go
@@ -250,9 +250,10 @@ func (q Quirks) XFSMkfsConfig() string {
 	// if the version doesn't parse, we assume it's latest Talos
 	// update when we have a new LTS config
 	case version == nil:
-		// [TODO]: lts_6.18.config doesn't work with GRUB, it doesn't recognize the xfs filesystem.
-		return "/usr/share/xfsprogs/mkfs/lts_6.12.conf"
+		return "/usr/share/xfsprogs/mkfs/lts_6.18.conf"
 	// add new version once we have a new LTS config
+	case version.GTE(semver.MustParse("1.13.0")):
+		return "/usr/share/xfsprogs/mkfs/lts_6.18.conf"
 	case version.GTE(semver.MustParse("1.10.0")):
 		return "/usr/share/xfsprogs/mkfs/lts_6.12.conf"
 	case version.GTE(semver.MustParse("1.8.0")) && version.LT(semver.MustParse("1.10.0")):
diff --git a/pkg/machinery/imager/quirks/quirks_test.go b/pkg/machinery/imager/quirks/quirks_test.go
@@ -169,10 +169,10 @@ func TestXFSMkfsConfigFile(t *testing.T) {
 		},
 		{
 			version:  "1.13.0",
-			expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
+			expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
 		},
 		{
-			expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
+			expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
 		},
 	} {
 		t.Run(test.version, func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-v1.13.0-alpha.0-35-g375983f`
	`1`	`+v1.13.0-alpha.0-37-g1b4fbf5`
Original file line number	Diff line number	Diff line change
`@@ -169,10 +169,10 @@ func TestXFSMkfsConfigFile(t *testing.T) {`
`169`	`169`	`},`
`170`	`170`	`{`
`171`	`171`	`version: "1.13.0",`
`172`		`- expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",`
	`172`	`+ expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",`
`173`	`173`	`},`
`174`	`174`	`{`
`175`		`- expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",`
	`175`	`+ expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",`
`176`	`176`	`},`
`177`	`177`	`} {`
`178`	`178`	`t.Run(test.version, func(t *testing.T) {`