Skip to content
This repository was archived by the owner on Aug 7, 2025. It is now read-only.

Skip NetworkManager when systemd-networkd is required #824

Merged
bryteise merged 1 commit into from
Jun 10, 2025
Merged

Skip NetworkManager when systemd-networkd is required #824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ var (
const (
// NetWorkManager is the application to manage network.
NetWorkManager = "Network Manager"
NetworkdBundle = "systemd-networkd-autostart"
)

func sortMountPoint(bds []*storage.BlockDevice) []*storage.BlockDevice {
Expand Down Expand Up @@ -343,8 +344,9 @@ func Install(rootDir string, model *model.SystemInstall, options args.Args) erro
return err
}

// If we are using NetworkManager add the basic bundle
if network.IsNetworkManagerActive() {
// If we are using NetworkManager add the basic bundle, unless
// we have systemd-networkd bundle, in which case skip it
if network.IsNetworkManagerActive() && !model.ContainsBundle(NetworkdBundle) {
log.Info("Adding bundle '%s' to enable networking", network.RequiredBundle)
model.AddBundle(network.RequiredBundle)
}
Expand Down