mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2026-05-04 12:01:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not pick up a system disk from a loop device

Browse Source 
If someone mounts a Talos disk image over a loop device, it will appear
in DiscoveredVolumes correctly, but we should not match it as a system
disk. A system disk can't be a loop device.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2026-05-01 15:51:18 +04:00
parent dedb7a96c1
commit 3bae01ac11
No known key found for this signature in database
GPG Key ID: 322C6F63F594CE7C
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/machined/pkg/controllers/block/system_disk.go
View File

@ -7,6 +7,7 @@ package block
import (
"context"
"fmt"
"strings"
"github.com/cosi-project/runtime/pkg/controller"
"github.com/cosi-project/runtime/pkg/safe"
@ -68,6 +69,11 @@ func (ctrl *SystemDiskController) Run(ctx context.Context, r controller.Runtime,
)
for volume := range discoveredVolumes.All() {
// ignore loop devices, a disk image of Talos might be mounted there, and we don't want to consider it as a candidate for the system disk.
if strings.HasPrefix(volume.TypedSpec().Parent, "loop") {
continue
}
if volume.TypedSpec().PartitionLabel == constants.MetaPartitionLabel {
systemDiskID = volume.TypedSpec().Parent
systemDiskPath = volume.TypedSpec().ParentDevPath

11
internal/app/machined/pkg/controllers/block/system_disk_test.go
View File

@ -37,11 +37,20 @@ func TestSystemDiskSuite(t *testing.T) {
func (suite *SystemDiskSuite) TestReconcile() {
ctest.AssertNoResource[*block.SystemDisk](suite, block.SystemDiskID)
discoveredVolumeLoop := block.NewDiscoveredVolume(block.NamespaceName, "loop11p4")
discoveredVolumeLoop.TypedSpec().PartitionLabel = constants.MetaPartitionLabel
discoveredVolumeLoop.TypedSpec().Parent = "loop11"
discoveredVolumeLoop.TypedSpec().ParentDevPath = "/dev/loop11"
suite.Create(discoveredVolumeLoop)
// loop devices should be ignored, so the system disk should not be created.
ctest.AssertNoResource[*block.SystemDisk](suite, block.SystemDiskID)
discoveredVolume := block.NewDiscoveredVolume(block.NamespaceName, "vda4")
discoveredVolume.TypedSpec().PartitionLabel = constants.MetaPartitionLabel
discoveredVolume.TypedSpec().Parent = "vda"
discoveredVolume.TypedSpec().ParentDevPath = "/dev/vda"
suite.Require().NoError(suite.State().Create(suite.Ctx(), discoveredVolume))
suite.Create(discoveredVolume)
ctest.AssertResource(suite, block.SystemDiskID, func(r *block.SystemDisk, asrt *assert.Assertions) {
asrt.Equal("vda", r.TypedSpec().DiskID)