Module Name: src
Committed By: martin
Date: Mon Jul 13 13:58:31 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/hooks [netbsd-8]: 01-test
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/external/bsd/dhcpcd/dist/hooks/01-test
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/hooks/01-test
diff -u src/external/bsd/dhcpcd/dist/hooks/01-test:1.1.1.1.8.1 src/external/bsd/dhcpcd/dist/hooks/01-test:1.1.1.1.8.2
--- src/external/bsd/dhcpcd/dist/hooks/01-test:1.1.1.1.8.1 Sat Jan 13 21:35:30 2018
+++ src/external/bsd/dhcpcd/dist/hooks/01-test Mon Jul 13 13:58:31 2020
@@ -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
