pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1001366 from GNOME:Factory

Browse Source 
- avahi-daemon-check-dns.sh: convert obsolete egrep call to grep -E
  (boo#1203092) (forwarded request 1001132 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/1001366
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger 2022-09-07 09:05:25 +00:00 committed by Git OBS Bridge
commit 0a90ee8ecf
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avahi-daemon-check-dns.sh
View File

@ -43,7 +43,7 @@ dns_reachable() {
# If there is no local nameserver and no we have no global ip addresses # If there is no local nameserver and no we have no global ip addresses
# then we can't reach any nameservers # then we can't reach any nameservers
if ! $(egrep -q "nameserver 127.0.0.1|::1" /etc/resolv.conf); then if ! $(grep -E -q "nameserver 127.0.0.1|::1" /etc/resolv.conf); then
if [ -x "$(which ip)" ]; then if [ -x "$(which ip)" ]; then
ADDRS=$(ip addr show scope global | grep inet) ADDRS=$(ip addr show scope global | grep inet)
ROUTES=$(ip route show 0.0.0.0/0) ROUTES=$(ip route show 0.0.0.0/0)
@ -51,7 +51,7 @@ dns_reachable() {
# Get addresses of all running interfaces # Get addresses of all running interfaces
ADDRS=$(LC_ALL=C ifconfig | grep ' addr:') ADDRS=$(LC_ALL=C ifconfig | grep ' addr:')
# Filter out all local addresses # Filter out all local addresses
ADDRS=$(echo "${ADDRS}" | egrep -v ':127|Scope:Host|Scope:Link') ADDRS=$(echo "${ADDRS}" | grep -E -v ':127|Scope:Host|Scope:Link')
# Check we have a default route # Check we have a default route
ROUTES=$(route -n | grep '^0.0.0.0 ') ROUTES=$(route -n | grep '^0.0.0.0 ')
fi fi
@ -76,7 +76,7 @@ dns_has_local() {
# Use timeout when calling host as workaround for LP: #1752411 # Use timeout when calling host as workaround for LP: #1752411
OUT=`LC_ALL=C timeout 5 host -t soa local. 2>&1` OUT=`LC_ALL=C timeout 5 host -t soa local. 2>&1`
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
if echo "$OUT" | egrep -vq 'has no|not found'; then if echo "$OUT" | grep -E -vq 'has no|not found'; then
return 0 return 0
fi fi
else else

6
avahi.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 4 12:19:08 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
- avahi-daemon-check-dns.sh: convert obsolete egrep call to grep -E
(boo#1203092)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 9 12:30:21 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> Sat Jul 9 12:30:21 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>