jschoubben
01d68bda88
The same split lost them the other way round: the merge base held both changes, each branch had reset the other's files, and the three-way merge kept neither. Both halves of hq ADR 0161 are on main again with this.
32 lines
685 B
JSON
32 lines
685 B
JSON
{
|
|
"module": "dhcpcd",
|
|
"version": "1",
|
|
"capabilities": [
|
|
"package-manager",
|
|
"service-manager",
|
|
"uplink-dhcpcd"
|
|
],
|
|
"claims": [
|
|
{
|
|
"name": "node-uplink",
|
|
"scope": "node"
|
|
}
|
|
],
|
|
"resources": [
|
|
{
|
|
"id": "package",
|
|
"type": "package",
|
|
"package": "dhcpcd"
|
|
},
|
|
{
|
|
"id": "config",
|
|
"type": "file",
|
|
"path": "/etc/dhcpcd.conf",
|
|
"mode": "0644",
|
|
"into": "block",
|
|
"at": "start",
|
|
"content": "# The mesh's two lines (module dhcpcd, novox/hq ADR 0117). Global options, so\n# kept above any interface line; read at dhcpcd's next start.\nnohook resolv.conf\ndenyinterfaces mesh0\n"
|
|
}
|
|
]
|
|
}
|