Skip to content

Commit 27253d7

Browse files
frezbofrezbo
committed
feat: use new xfs config file
Use new xfs config file version. Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent c9d84ae commit 27253d7

File tree

9 files changed

+19
-25
lines changed

9 files changed

+19
-25
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EMBED_TARGET ?= embed
2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
2828
TOOLS ?= v1.13.0-alpha.0-6-g896f8b9
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.13.0-alpha.0-27-ga220898
30+
PKGS ?= v1.13.0-alpha.0-28-gdf4b4c8
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

‎hack/release.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ preface = """
1818
[notes.updates]
1919
title = "Component Updates"
2020
description = """\
21-
Linux: 6.18.2
21+
Linux: 6.18.4
2222
containerd: 2.2.1
2323
etcd: 3.6.7
2424
CoreDNS: 1.13.2

‎pkg/machinery/constants/constants.go‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
const (
1616
// DefaultKernelVersion is the default Linux kernel version.
17-
DefaultKernelVersion = "6.18.2-talos"
17+
DefaultKernelVersion = "6.18.4-talos"
1818

1919
// KernelParamConfig is the kernel parameter name for specifying the URL.
2020
// to the config.
@@ -1306,19 +1306,6 @@ const (
13061306
LogFlushPeriod = 15 * time.Second
13071307
)
13081308

1309-
// See https://linux.die.net/man/3/klogctl
1310-
//
1311-
//nolint:stylecheck,revive
1312-
const (
1313-
// SYSLOG_ACTION_SIZE_BUFFER is a named type argument to klogctl.
1314-
//nolint:golint
1315-
SYSLOG_ACTION_SIZE_BUFFER = 10
1316-
1317-
// SYSLOG_ACTION_READ_ALL is a named type argument to klogctl.
1318-
//nolint:golint
1319-
SYSLOG_ACTION_READ_ALL = 3
1320-
)
1321-
13221309
// names of variable that can be substituted in the talos.config kernel parameter.
13231310
const (
13241311
UUIDKey = "uuid"

‎pkg/machinery/gendata/data/pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.13.0-alpha.0-27-ga220898
1+
v1.13.0-alpha.0-28-gdf4b4c8

‎pkg/machinery/imager/quirks/quirks.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,10 @@ 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.12.conf"
253+
return "/usr/share/xfsprogs/mkfs/lts_6.18.conf"
254254
// 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"
255257
case version.GTE(semver.MustParse("1.10.0")):
256258
return "/usr/share/xfsprogs/mkfs/lts_6.12.conf"
257259
case version.GTE(semver.MustParse("1.8.0")) && version.LT(semver.MustParse("1.10.0")):

‎pkg/machinery/imager/quirks/quirks_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,15 @@ func TestXFSMkfsConfigFile(t *testing.T) {
164164
expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
165165
},
166166
{
167+
version: "1.12.0",
167168
expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
168169
},
169170
{
170-
expected: "/usr/share/xfsprogs/mkfs/lts_6.12.conf",
171+
version: "1.13.0",
172+
expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
173+
},
174+
{
175+
expected: "/usr/share/xfsprogs/mkfs/lts_6.18.conf",
171176
},
172177
} {
173178
t.Run(test.version, func(t *testing.T) {

‎pkg/makefs/xfs_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ func TestXFSInfo(t *testing.T) { //nolint:tparallel
3939
= sectsz=512 attr=2, projid32bit=1
4040
= crc=1 finobt=1, sparse=1, rmapbt=1
4141
= reflink=1 bigtime=1 inobtcount=1 nrext64=1
42-
= exchange=0 metadir=0
42+
= exchange=1 metadir=0
4343
data = bsize=4096 blocks=262144, imaxpct=25
4444
= sunit=0 swidth=0 blks
45-
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0
45+
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=1
4646
log =internal log bsize=4096 blocks=16384, version=2
4747
= sectsz=512 sunit=0 blks, lazy-count=1
4848
realtime =none extsz=4096 blocks=0, rtextents=0
@@ -59,10 +59,10 @@ realtime =none extsz=4096 blocks=0, rtextents=0
5959
= sectsz=512 attr=2, projid32bit=1
6060
= crc=1 finobt=1, sparse=1, rmapbt=1
6161
= reflink=1 bigtime=1 inobtcount=1 nrext64=1
62-
= exchange=0 metadir=0
62+
= exchange=1 metadir=0
6363
data = bsize=4096 blocks=2621440, imaxpct=25
6464
= sunit=0 swidth=0 blks
65-
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0
65+
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=1
6666
log =internal log bsize=4096 blocks=16384, version=2
6767
= sectsz=512 sunit=0 blks, lazy-count=1
6868
realtime =none extsz=4096 blocks=0, rtextents=0
@@ -79,10 +79,10 @@ realtime =none extsz=4096 blocks=0, rtextents=0
7979
= sectsz=512 attr=2, projid32bit=1
8080
= crc=1 finobt=1, sparse=1, rmapbt=1
8181
= reflink=1 bigtime=1 inobtcount=1 nrext64=1
82-
= exchange=0 metadir=0
82+
= exchange=1 metadir=0
8383
data = bsize=4096 blocks=26214400, imaxpct=25
8484
= sunit=0 swidth=0 blks
85-
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0
85+
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=1
8686
log =internal log bsize=4096 blocks=16384, version=2
8787
= sectsz=512 sunit=0 blks, lazy-count=1
8888
realtime =none extsz=4096 blocks=0, rtextents=0

‎pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi‎

512 Bytes
Binary file not shown.

‎pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)