From a7a81e98253258257e0d14e269b7beef3498624f Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Fri, 29 Aug 2025 11:05:42 -0400 Subject: [PATCH 1/2] always manage script, only run it if bond0 exists --- salt/sensor/init.sls | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/salt/sensor/init.sls b/salt/sensor/init.sls index ee615bf9b..7d1714c2c 100644 --- a/salt/sensor/init.sls +++ b/salt/sensor/init.sls @@ -39,11 +39,9 @@ combine_bond_script: - template: jinja - defaults: CHANNELS: {{ SENSORMERGED.channels }} - - onlyif: - - ip link show bond0 execute_combine_bond: cmd.run: - name: /usr/sbin/so-combine-bond - - onchanges: - - file: combine_bond_script + - onlyif: + - ip link show bond0 From 19362fe5e57f338e19389e21f027ac09e71d8ca1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 29 Aug 2025 11:06:25 -0400 Subject: [PATCH 2/2] Update so-combine-bond --- salt/sensor/tools/sbin_jinja/so-combine-bond | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/sensor/tools/sbin_jinja/so-combine-bond b/salt/sensor/tools/sbin_jinja/so-combine-bond index 0a8a2e66a..ded429470 100644 --- a/salt/sensor/tools/sbin_jinja/so-combine-bond +++ b/salt/sensor/tools/sbin_jinja/so-combine-bond @@ -18,7 +18,7 @@ fi # Check if bond0 exists if ! ip link show bond0 &>/dev/null; then - exit 1 + exit 0 fi # Function to get slave interfaces - works across distributions @@ -48,7 +48,7 @@ get_bond_slaves() { SLAVES=$(get_bond_slaves bond0) if [ -z "$SLAVES" ]; then - exit 1 + exit 0 fi # Process each slave interface