From 07f07fff3b5db2c861b91e75b06b143e41a57e8e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 28 May 2023 13:03:08 +0200
Subject: [PATCH] system: improve static routes error handling

3c7fb657e14dfc muted "delete" operations but also "add" which makes
it impossible to see failures like the latest regression fixed in
25e2c0a301e1.  Since system_default_route() handles this accordingly
use the same approach here.
---
 src/etc/inc/system.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 164d98df2..27b757e0e 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -678,6 +678,7 @@ function system_routing_configure($verbose = false, $interface = null, $monitor
                     break;
             }
 
+            /* XXX some day we might want to convert to safer mwexecf() */
             $cmd = " -{$ipproto} {$blackhole} " . escapeshellarg($rtent['network']) . " ";
 
             if (!empty($rtent['disabled'])) {
@@ -687,14 +688,14 @@ function system_routing_configure($verbose = false, $interface = null, $monitor
                     mwexec("/sbin/route delete {$cmd}", true);
                     if ($fargw) {
                         mwexecf('/sbin/route delete -%s %s -interface %s ', [$ipproto, $gatewayip, $interfacegw], true);
-                        mwexecf('/sbin/route add -%s %s -interface %s', [$ipproto, $gatewayip, $interfacegw], true);
+                        mwexecf('/sbin/route add -%s %s -interface %s', [$ipproto, $gatewayip, $interfacegw]);
                     } elseif (is_linklocal($gatewayip) && strpos($gatewayip, '%') === false) {
                         $gatewayip .= "%{$interfacegw}";
                     }
-                    mwexec("/sbin/route add" . $cmd . escapeshellarg($gatewayip), true);
+                    mwexec("/sbin/route add" . $cmd . escapeshellarg($gatewayip));
                 } elseif (!empty($interfacegw)) {
                     mwexec("/sbin/route delete" . $cmd . "-interface " . escapeshellarg($interfacegw), true);
-                    mwexec("/sbin/route add" . $cmd . "-interface " . escapeshellarg($interfacegw), true);
+                    mwexec("/sbin/route add" . $cmd . "-interface " . escapeshellarg($interfacegw));
                 }
             }
         }