Skip to content

Commit 42e4f43

Browse files
authored
Merge pull request #1067 from AkihiroSuda/fix-yaml-override-doc
pkg/limayaml: fix comments about the overriding order
2 parents 796d949 + 8ff9ee0 commit 42e4f43

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkg/limayaml/defaults.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ func MACAddress(uniqueID string) string {
7272
// Exceptions:
7373
// - Mounts are appended in d, y, o order, but "merged" when the Location matches a previous entry;
7474
// the highest priority Writable setting wins.
75+
// - Networks are appended in d, y, o order
7576
// - DNS are picked from the highest priority where DNS is not empty.
76-
// - CACertificates Files and Certs are uniquely appended
77+
// - CACertificates Files and Certs are uniquely appended in d, y, o order
7778
func FillDefault(y, d, o *LimaYAML, filePath string) {
7879
if y.Arch == nil {
7980
y.Arch = d.Arch

0 commit comments

Comments
 (0)