B #-: Avoid netplan race condition

xorel · xorel · commit 8073d3271ccc · 2022-12-20T14:50:45.000+01:00
diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-netplan b/src/etc/one-context.d/loc-10-network.d/netcfg-netplan
@@ -41,7 +41,7 @@ configure_network()
     # booting of current systems, so we execute netplan apply on the background
     case "${NETCFG_NETPLAN_RENDERER}" in
         ''|networkd)
-            nohup netplan apply &>/dev/null &
+            flock /var/run/one-context/netplan.lock nohup netplan apply &>/dev/null &
             ;;
     esac
 }
@@ -56,14 +56,14 @@ start_network()
     netplan generate
     nm_symlink_run_connections
     service networking start
-    netplan apply
+    flock /var/run/one-context/netplan.lock netplan apply
 }
 
 reload_network()
 {
     netplan generate
     nm_symlink_run_connections
-    netplan apply
+    flock /var/run/one-context/netplan.lock netplan apply
 }
 
 #

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ configure_network()`
`41`	`41`	`# booting of current systems, so we execute netplan apply on the background`
`42`	`42`	`case "${NETCFG_NETPLAN_RENDERER}" in`
`43`	`43`	`''\|networkd)`
`44`		`- nohup netplan apply &>/dev/null &`
	`44`	`+ flock /var/run/one-context/netplan.lock nohup netplan apply &>/dev/null &`
`45`	`45`	`;;`
`46`	`46`	`esac`
`47`	`47`	`}`
`@@ -56,14 +56,14 @@ start_network()`
`56`	`56`	`netplan generate`
`57`	`57`	`nm_symlink_run_connections`
`58`	`58`	`service networking start`
`59`		`- netplan apply`
	`59`	`+ flock /var/run/one-context/netplan.lock netplan apply`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`reload_network()`
`63`	`63`	`{`
`64`	`64`	`netplan generate`
`65`	`65`	`nm_symlink_run_connections`
`66`		`- netplan apply`
	`66`	`+ flock /var/run/one-context/netplan.lock netplan apply`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`#`