From 5764c977f14e780d468dc65d8aa95eaa3836cca5 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Tue, 3 Dec 2024 00:43:32 -0500 Subject: [PATCH] modules: misc: Don't ignore the router setting This mistake caused us to ignore the router setting when we wanted it! Woops =D --- modules/misc/main.mcl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/misc/main.mcl b/modules/misc/main.mcl index 884a8a90..d44aeb94 100644 --- a/modules/misc/main.mcl +++ b/modules/misc/main.mcl @@ -106,7 +106,7 @@ class network_manager_static($st) { [connection] id=${dev} {{ if .uuid -}} -uuid=${uuid} +uuid={{ .uuid }} {{ end -}} type=ethernet interface-name=${dev} @@ -114,7 +114,7 @@ autoconnect=true [ipv4] {{ if .router -}} -address1=${ip}/${prefix},${router} +address1=${ip}/${prefix},{{ .router }} {{ else -}} address1=${ip}/${prefix} {{ end -}} @@ -125,12 +125,14 @@ method=manual [ethernet] {{ if .mac -}} -mac-address=${mac} +mac-address={{ .mac }} {{ end -}} " $args = struct{ uuid => $uuid, + mac => $mac, + router => $router, } file "/etc/NetworkManager/system-connections/${dev}.nmconnection" {