From 01d68bda880efb1cb4544106f5e7a897a8ca7afc Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 1 Oct 2026 17:19:41 +0200 Subject: [PATCH] And the uplink holders' capabilities return 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. --- modules/dhcpcd/module.json | 3 ++- modules/networkmanager/module.json | 3 ++- modules/systemd-networkd/module.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/dhcpcd/module.json b/modules/dhcpcd/module.json index 89ffe07..23c658e 100644 --- a/modules/dhcpcd/module.json +++ b/modules/dhcpcd/module.json @@ -3,7 +3,8 @@ "version": "1", "capabilities": [ "package-manager", - "service-manager" + "service-manager", + "uplink-dhcpcd" ], "claims": [ { diff --git a/modules/networkmanager/module.json b/modules/networkmanager/module.json index 5aaa8f6..37c2ba7 100644 --- a/modules/networkmanager/module.json +++ b/modules/networkmanager/module.json @@ -3,7 +3,8 @@ "version": "1", "capabilities": [ "package-manager", - "service-manager" + "service-manager", + "uplink-networkmanager" ], "claims": [ { diff --git a/modules/systemd-networkd/module.json b/modules/systemd-networkd/module.json index 040b67e..370cf1d 100644 --- a/modules/systemd-networkd/module.json +++ b/modules/systemd-networkd/module.json @@ -3,7 +3,8 @@ "version": "1", "capabilities": [ "package-manager", - "service-manager" + "service-manager", + "uplink-systemd-networkd" ], "claims": [ {