diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/ifupdown/functions.sh | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a4a882a..9ad933d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wpa (2:2.10-18) unstable; urgency=medium + + * Use "command" when calling actual ifupdown and not its shell wrappers + (Closes: #1056976) + + -- Andrej Shadura <andrewsh@debian.org> Thu, 30 Nov 2023 10:01:49 +0100 + wpa (2:2.10-17) unstable; urgency=medium [ Guillem Jover ] diff --git a/debian/ifupdown/functions.sh b/debian/ifupdown/functions.sh index cc68870..f8e2e47 100644 --- a/debian/ifupdown/functions.sh +++ b/debian/ifupdown/functions.sh @@ -933,7 +933,7 @@ ifup () { fi if [ -n "$WPA_LOGICAL_IFACE" ]; then - if ! ifquery "${WPA_LOGICAL_IFACE}" > /dev/null 2>&1; then + if ! command ifquery "${WPA_LOGICAL_IFACE}" > /dev/null 2>&1; then wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE and included files." WPA_LOGICAL_IFACE="default" fi @@ -942,11 +942,11 @@ ifup () { ifupdown_lock - if ifquery "$WPA_IFACE" | grep -q '^wpa-roam: ' ; then + if command ifquery "$WPA_IFACE" | grep -q '^wpa-roam: ' ; then # Force settings over the unconfigured "master" IFACE - ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE" + command ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE" else - ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE" + command ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE" fi IFUP_RETVAL="$?" @@ -970,7 +970,7 @@ ifdown () { ifupdown_lock - ifdown -v "$WPA_IFACE" + command ifdown -v "$WPA_IFACE" ifupdown_unlock |