Commit 77a96f8
committed
fix(applycheck): accept stable disk symlinks for RefKindDiskLiteral
machine.install.disk is most safely written as a /dev/disk/by-id/
or /dev/disk/by-path/ form — the kernel-assigned /dev/sdX names
reorder across reboots, but the udev-managed symlinks pin to the
underlying device. Talos's block.DiskSpec exposes those alternate
forms in spec.symlinks; the gate must accept any of them as
equivalent to spec.dev_path.
Without this fix, the recommended-for-production literal
'disk: /dev/disk/by-id/wwn-0x...' surfaced a Phase 1 blocker with
a hint listing only /dev/sda — pushing operators toward the
unstable kernel name. cosiLinksDisksReader now carries Symlinks
into the snapshot; ValidateRefs builds the path set from
DevPath + Symlinks. Verified on the dev17 OCI cluster: a by-id
literal that previously blocked now passes Phase 1.
Refs: #172
Signed-off-by: Aleksei Sviridkin <f@lex.la>1 parent bafa4a8 commit 77a96f8
3 files changed
Lines changed: 54 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
32 | 39 | | |
33 | 40 | | |
34 | 41 | | |
| |||
42 | 49 | | |
43 | 50 | | |
44 | 51 | | |
| 52 | + | |
45 | 53 | | |
46 | 54 | | |
47 | 55 | | |
| |||
90 | 98 | | |
91 | 99 | | |
92 | 100 | | |
93 | | - | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
94 | 106 | | |
95 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
96 | 113 | | |
97 | 114 | | |
98 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
88 | 122 | | |
89 | 123 | | |
90 | 124 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
| 304 | + | |
304 | 305 | | |
305 | 306 | | |
306 | 307 | | |
| |||
0 commit comments