ifupdown2-hotplug: flock and pass fd to ifupdown2

CumulusNetworks · Jun 13, 2023 · 1334553 · 1334553
1 parent 56be5ec
commit 1334553
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/debian/ifupdown2-hotplug b/debian/ifupdown2-hotplug
@@ -13,6 +13,8 @@ else
 	unset LOGGER
 fi
 
+LOCKFILE=/run/network/.lock
+
 # for diagnostics
 if [ -t 1 -a -z "$LOGGER" ] || [ ! -e '/dev/log' ]; then
 	mesg() {
@@ -48,24 +50,23 @@ wait_for_interface() {
 }
 
 net_ifup() {
-
+    flock 9
     wait_for_interface lo
-
-    if $(ifquery -l --allow=hotplug 2>/dev/null | grep -w -q "^$INTERFACE$"); then
-	exec ifup $INTERFACE --systemd
+    if $(ifquery -L 9 -l --allow=hotplug 2>/dev/null | grep -w -q "^$INTERFACE$"); then
+	exec ifup $INTERFACE -L 9 --systemd
     else
 	mesg "NET $INTERFACE not a hotplug interface"
     fi
-}
+} 9>$LOCKFILE
 
 net_ifdown() {
-
-    if $(ifquery -l --allow=hotplug 2>/dev/null | grep -w -q "^$INTERFACE$"); then
-	exec ifdown $INTERFACE --systemd
+    flock 9
+    if $(ifquery -L 9 -l --allow=hotplug 2>/dev/null | grep -w -q "^$INTERFACE$"); then
+	exec ifdown $INTERFACE -L 9 --systemd
     else
 	mesg "NET $INTERFACE not a hotplug interface"
     fi
-}
+} 9>$LOCKFILE
 
 do_everything() {