X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=misc_fixes.patch;fp=misc_fixes.patch;h=8debdaf83d1c0dc760f0ed8ade9ae639d0664a37;hp=21c5c1af8fa46abe30b5c43e7351848dc0dae57e;hb=b900baf13421f952a7a9a8f1f12d0446a544bb95;hpb=8cb09557bf2a4fa952b31d448192b86c1e2e4b8b

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 21c5c1a..8debdaf 100644
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -51,3 +51,25 @@ index a196f21..a4f125d 100644
  RUN_SULOGIN_ON_ERR=yes
  
  # Default run nice level for all services if $SERVICE_RUN_NICE_LEVEL is not
+diff --git a/lib/functions.network b/lib/functions.network
+index d151b04..862d42b 100644
+--- a/lib/functions.network
++++ b/lib/functions.network
+@@ -484,7 +484,7 @@ setup_ip_rules ()
+ 				/sbin/ip rule add $args $prio
+ 			done
+ 		elif is_no "$1"; then
+-			LC_ALL=C /sbin/ip rule show | grep -vE -e "from all lookup (main|default|local|253|254|255) \$" -e " map-to " | while read prio from src args; do
++			LC_ALL=C /sbin/ip rule show | grep -vE -e "from all lookup (main|default|local|253|254|255)[[:space:]]*\$" -e " map-to " | while read prio from src args; do
+ 				[ "$src" = "all" ] && /sbin/ip rule delete $args || /sbin/ip rule delete $from $src $args
+ 			done
+ 		fi
+@@ -503,7 +503,7 @@ setup_ip_rules ()
+ 				/sbin/ip -6 rule add $args $prio
+ 			done
+ 		elif is_no "$1"; then
+-			LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all lookup (main|default|local|253|254|255) \$" -e " map-to " | while read prio from src args; do
++			LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all lookup (main|default|local|253|254|255)[[:space:]]*\$" -e " map-to " | while read prio from src args; do
+ 				[ "$src" = "all" ] && /sbin/ip -6 rule delete $args || /sbin/ip -6 rule delete $from $src $args
+ 			done
+ 		fi