From 8680351c131d29a76682569742dbd44c8ffe47d3 Mon Sep 17 00:00:00 2001
From: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>
Date: Mon, 21 Oct 2024 20:30:08 +0200
Subject: [PATCH] chore: move system extensions' udev rules

Update packages and relevant paths
Ref: siderolabs/pkgs#1053

Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>
---
 Dockerfile                             | 1 +
 Makefile                               | 2 +-
 hack/release.toml                      | 2 +-
 pkg/machinery/constants/constants.go   | 4 ++--
 pkg/machinery/extensions/extensions.go | 2 +-
 pkg/machinery/gendata/data/pkgs        | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb91f8cca9..137d21597e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -794,6 +794,7 @@ RUN <<END
 END
 
 FROM rootfs-base-${TARGETARCH} AS rootfs-base
+RUN mkdir -p /rootfs/usr/etc
 RUN echo "true" > /rootfs/usr/etc/in-container
 RUN find /rootfs -print0 \
     | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
diff --git a/Makefile b/Makefile
index f13907ce1d..1f3d9f03a3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0-alpha.0-4-g2058296
 DEBUG_TOOLS_SOURCE := scratch
 
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.9.0-alpha.0-26-gc9282c8
+PKGS ?= v1.9.0-alpha.0-28-g38304a6
 EXTRAS ?= v1.9.0-alpha.0-1-geab6e58
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
diff --git a/hack/release.toml b/hack/release.toml
index 340d1c6d67..e1cb3b6166 100644
--- a/hack/release.toml
+++ b/hack/release.toml
@@ -18,7 +18,7 @@ preface = """
     [notes.updates]
         title = "Component Updates"
         description = """\
-Linux: 6.6.57
+Linux: 6.6.58
 containerd: 2.0.0-rc.5
 Flannel: 0.26.0
 Kubernetes: 1.32.0-alpha.2
diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go
index 947d291089..881a1cf92c 100644
--- a/pkg/machinery/constants/constants.go
+++ b/pkg/machinery/constants/constants.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	// DefaultKernelVersion is the default Linux kernel version.
-	DefaultKernelVersion = "6.6.57-talos"
+	DefaultKernelVersion = "6.6.58-talos"
 
 	// KernelModulesPath is the default path to the kernel modules without the kernel version.
 	KernelModulesPath = "/lib/modules"
@@ -933,7 +933,7 @@ const (
 	KubeSpanLinkMinimumMTU = 1280
 
 	// UdevDir is the path to the udev directory.
-	UdevDir = "/usr/etc/udev"
+	UdevDir = "/usr/lib/udev"
 
 	// UdevRulesPath rules file path.
 	UdevRulesPath = UdevDir + "/" + "rules.d/99-talos.rules"
diff --git a/pkg/machinery/extensions/extensions.go b/pkg/machinery/extensions/extensions.go
index 5e2953b435..609aca5194 100644
--- a/pkg/machinery/extensions/extensions.go
+++ b/pkg/machinery/extensions/extensions.go
@@ -16,7 +16,7 @@ var AllowedPaths = []string{
 	"/lib64/ld-linux-x86-64.so.2",
 	// /sbin/ldconfig is required by the nvidia container toolkit.
 	"/sbin/ldconfig",
-	"/usr/etc/udev/rules.d",
+	"/usr/lib/udev/rules.d",
 	"/usr/local",
 	// glvnd, egl and vulkan are needed for OpenGL/Vulkan.
 	"/usr/share/glvnd",
diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs
index 1d3d3e41b9..9625d78d32 100644
--- a/pkg/machinery/gendata/data/pkgs
+++ b/pkg/machinery/gendata/data/pkgs
@@ -1 +1 @@
-v1.9.0-alpha.0-26-gc9282c8
\ No newline at end of file
+v1.9.0-alpha.0-28-g38304a6
\ No newline at end of file