Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/external/bsd/dhcpcd/dist/hooks Apply patch, requested by ...



details:   https://anonhg.NetBSD.org/src/rev/688406e123af
branches:  netbsd-8
changeset: 935934:688406e123af
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 13 13:58:31 2020 +0000

description:
Apply patch, requested by roy in ticket #1570:

        external/bsd/dhcpcd/dist/hooks/01-test          (apply patch)

Fix dhcpcd test not to require /usr by syncing with the 01-test hook with
-current (which uses a newer dhcpcd version).

diffstat:

 external/bsd/dhcpcd/dist/hooks/01-test |  36 ++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 915907f85403 -r 688406e123af external/bsd/dhcpcd/dist/hooks/01-test
--- a/external/bsd/dhcpcd/dist/hooks/01-test    Wed Jul 08 13:48:36 2020 +0000
+++ b/external/bsd/dhcpcd/dist/hooks/01-test    Mon Jul 13 13:58:31 2020 +0000
@@ -1,9 +1,37 @@
 # Echo the interface flags, reason and message options
 
 if [ "$reason" = "TEST" ]; then
-       set | grep \
-           "^\(interface\|pid\|reason\|protocol\|profile\|skip_hooks\)=" | sort
-       set | grep "^if\(carrier\|flags\|mtu\|wireless\|ssid\)=" | sort
-       set | grep "^\(new_\|old_\|nd[0-9]*_\)" | sort
+       # General variables at the top
+       set | while read line; do
+               case "$line" in
+               interface=*|pid=*|reason=*|protocol=*|profile=*|skip_hooks=*)
+                       echo "$line";;
+               esac
+       done
+       # Interface flags
+       set | while read line; do
+               case "$line" in
+               ifcarrier=*|ifflags=*|ifmetric=*|ifmtu=*|ifwireless=*|ifssid=*)
+                       echo "$line";;
+               esac
+       done
+       # Old lease
+       set | while read line; do
+               case "$line" in
+               old_*) echo "$line";;
+               esac
+       done
+       # New lease
+       set | while read line; do
+               case "$line" in
+               new_*) echo "$line";;
+               esac
+       done
+       # Router Advertisements
+       set | while read line; do
+               case "$line" in
+               nd[0-9]*_*) echo "$line";;
+               esac
+       done
        exit 0
 fi



Home | Main Index | Thread Index | Old Index