README.md

@@ -92,7 +92,7 @@ sudo lnxrouter -i eth1 -o isp5  --no-dns  --dhcp-dns 1.1.1.1  -6 --dhcp-dns6 [26
 > In this case of usage, it's recommended to:
 > 
 > 1. Stop serving local DNS
-> 2. Tell clients which DNS to use ISP5's DNS. (Or, a safe public DNS, like above example)
+> 2. Tell clients which DNS to use (ISP5's DNS. Or, a safe public DNS, like above example)
 
 > Also, read *Notice 1*
 
@@ -284,17 +284,17 @@ Options:
                             queries to other interfaces)
     -n                      Do not provide Internet (See Notice 1)
     --ban-priv              Disallow clients to access my private network
-    
+
     -g <ip>                 This host's IPv4 address in subnet (mask is /24)
                             (example: '192.168.5.1' or '5' shortly)
     -6                      Enable IPv6 (NAT)
     --no4                   Disable IPv4 Internet (not forwarding IPv4)
                             (See Notice 1). Usually used with '-6'
-                            
+
     --p6 <prefix>           Set IPv6 LAN address prefix (length 64) 
                             (example: 'fd00:0:0:5::' or '5' shortly) 
                             Using this enables '-6'
-                            
+
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
@@ -317,22 +317,21 @@ Options:
     -d                      DNS server will take into account /etc/hosts
     -e <hosts_file>         DNS server will take into account additional 
                             hosts file
-    --dns-nocache           DNS server no cache
+
-    
     --mac <MAC>             Set MAC address
     --random-mac            Use random MAC address
- 
+
     --tp <port>             Transparent proxy,
                             redirect non-LAN TCP and UDP traffic to port.
                             (usually used with '--dns')
-    
+
   WiFi hotspot options:
     --ap <wifi interface> <SSID>
                             Create WiFi access point
     -p, --password <password>   
                             WiFi password
-    --qr                    Show WiFi QR code in terminal (need qrencode)
+    --qr                    Show WiFi QR code in terminal
-    
+
     --hidden                Hide access point (not broadcast SSID)
     --no-virt               Do not create virtual interface
                             Using this you can't use same wlan interface
@@ -351,12 +350,12 @@ Options:
                             (defaults to /etc/hostapd/hostapd.accept)
     --hostapd-debug <level> 1 or 2. Passes -d or -dd to hostapd
     --isolate-clients       Disable wifi communication between clients
-    
+
     --ieee80211n            Enable IEEE 802.11n (HT)
     --ieee80211ac           Enable IEEE 802.11ac (VHT)
     --ht_capab <HT>         HT capabilities (default: [HT40+])
     --vht_capab <VHT>       VHT capabilities
-    
+
     --no-haveged            Do not run haveged automatically when needed
 
   Instance managing:
@@ -398,16 +397,6 @@ On exit of a linux-router instance, script **will do cleanup**, i.e. undo most c
 5. The wifi device which is used to create hotspot is `rfkill unblock`ed
 6. WiFi country code, if user assigns
 
-## Install
-
-1-file-script. Download and run (meet the dependencies).
-
-I'm currently not packaging for any distro. If you do, open a PR and add the link (can be with a version badge) to list here:
-
-| Linux distro |                                                                                                            |
-| ------------ | ---------------------------------------------------------------------------------------------------------- |
-| Any          | download [1-file-script](https://raw.githubusercontent.com/garywill/linux-router/master/lnxrouter) and run |
-
 ## Dependencies
 
 - bash
@@ -420,6 +409,7 @@ I'm currently not packaging for any distro. If you do, open a PR and add the lin
   - iw
   - iwconfig (you only need this if 'iw' can not recognize your adapter)
   - haveged (optional)
+  - qrencode (optional)
 
 ## TODO
 

lnxrouter

@@ -67,7 +67,6 @@ Options:
     -d                      DNS server will take into account /etc/hosts
     -e <hosts_file>         DNS server will take into account additional 
                             hosts file
-    --dns-nocache           DNS server no cache
     
     --mac <MAC>             Set MAC address
     --random-mac            Use random MAC address
@@ -81,7 +80,7 @@ Options:
                             Create WiFi access point
     -p, --password <password>   
                             WiFi password
-    --qr                    Show WiFi QR code in terminal (need qrencode)
+    --qr                    Show WiFi QR code in terminal
     
     --hidden                Hide access point (not broadcast SSID)
     --no-virt               Do not create virtual interface
@@ -157,7 +156,6 @@ define_global_variables(){
     SHOW_DNS_QUERY=0  # log dns
     ETC_HOSTS=0
     ADDN_HOSTS=
-    DNS_NOCACHE=
     CONN_IFACE=    # which interface user choose to use to create network
     INTERNET_IFACE= # which interface to get Internet from
     THISHOSTNAME=   # this host's name the DNS tells clients 
@@ -324,10 +322,6 @@ parse_user_options(){
                 ADDN_HOSTS="$1"
                 shift
                 ;;
-            --dns-nocache)
-                shift
-                DNS_NOCACHE=1
-                ;;
             
             --isolate-clients)
                 shift
@@ -1828,10 +1822,6 @@ write_dnsmasq_conf() {
 			no-poll
 		EOF
     fi
-    if [[ $DNS_NOCACHE -eq 1 ]]; then
-        echo "cache-size=0" >> "$CONFDIR/dnsmasq.conf"
-        echo "no-negcache" >> "$CONFDIR/dnsmasq.conf"
-    fi
     if [[ $IPV6 -eq 1 ]];then
         cat <<- EOF  >> "$CONFDIR/dnsmasq.conf"
 			listen-address=${GATEWAY6}