Merge 171bdb9e66 into d39b438161

README.md

@@ -327,7 +327,7 @@ Options:
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
-                            (default: use /etc/resolv.conf)
+                            (default: use /etc/resolve.conf)
                             (Note IPv6 addresses need '[]' around)
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
@@ -453,6 +453,7 @@ Visit [**my homepage** 🏡](https://garywill.github.io) to see **more tools and
 ## TODO
 - WPA3
 - Global IPv6
+- Explictly ban forwarding if not needed
 
 ## License
 

lnxrouter

@@ -47,7 +47,7 @@ Options:
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
-                            (default: use /etc/resolv.conf)
+                            (default: use /etc/resolve.conf)
                             (Note IPv6 addresses need '[]' around)
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
@@ -884,7 +884,7 @@ get_pid_by_dbus_name() {
     
     which dbus-send >/dev/null 2>&1 || return 1
     
-    pid="$( dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID string:$DBUS_NAME  2>/dev/null | grep "   uint32 " | awk '{print $2}' )"
+    pid="$( dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID string:$DBUS_NAME | grep "   uint32 " | awk '{print $2}' )" 2>/dev/null
     r=$?
     
     echo "$pid"