Simplify network interface matching

systemd-networkd can match wired interfaces based on Type=ether; let's switch to that to simplify the interface matching. Signed-off-by: Christopher Obbard <[email protected]>
go-debos · Dec 29, 2023 · f678bc3 · f678bc3
1 parent bb815e6
commit f678bc3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/backend.go b/backend.go
@@ -105,9 +105,6 @@ type backend interface {
 	// A list of udev rules
 	UdevRules() []string
 
-	// The match expression used for the networkd configuration
-	NetworkdMatch() string
-
 	// The tty used for the job output
 	JobOutputTTY() string
 

diff --git a/backend_qemu.go b/backend_qemu.go
@@ -162,10 +162,6 @@ func (b qemuBackend) UdevRules() []string {
 	return udevRules
 }
 
-func (b qemuBackend) NetworkdMatch() string {
-	return "e*"
-}
-
 func (b qemuBackend) JobOutputTTY() string {
 	// By default we send job output to the second virtio console,
 	// reserving /dev/ttyS0 for boot messages (which we ignore)

diff --git a/backend_uml.go b/backend_uml.go
@@ -100,10 +100,6 @@ func (b umlBackend) UdevRules() []string {
 	return udevRules
 }
 
-func (b umlBackend) NetworkdMatch() string {
-	return "vec*"
-}
-
 func (b umlBackend) JobOutputTTY() string {
 	// Send the fakemachine job output to the right console
 	if b.machine.showBoot {

diff --git a/machine.go b/machine.go
@@ -286,7 +286,7 @@ exec /lib/systemd/systemd
 `
 const networkdTemplate = `
 [Match]
-Name=%[1]s
+Type=ether
 
 [Network]
 DHCP=ipv4
@@ -808,7 +808,7 @@ func (m *Machine) startup(command string, extracontent [][2]string) (int, error)
 	}
 
 	err = w.WriteFile("/etc/systemd/network/ethernet.network",
-		fmt.Sprintf(networkdTemplate, backend.NetworkdMatch()), 0444)
+		networkdTemplate, 0444)
 	if err != nil {
 		return -1, err
 	}