Pārlūkot izejas kodu

resolv.conf path

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
f4294e0c22

+ 1
- 1
src/freedombone-image-customise Parādīt failu

243
     fi
243
     fi
244
 
244
 
245
     # configure DNS
245
     # configure DNS
246
-    resolvconf=$rootdir/var/run/NetworkManager/resolv.conf
246
+    resolvconf=$rootdir/etc/resolv.conf
247
     echo 'domain localdomain' > $resolvconf
247
     echo 'domain localdomain' > $resolvconf
248
     echo 'search localdomain' >> $resolvconf
248
     echo 'search localdomain' >> $resolvconf
249
     echo "nameserver $NAMESERVER1" >> $resolvconf
249
     echo "nameserver $NAMESERVER1" >> $resolvconf

+ 1
- 1
src/freedombone-utils-config Parādīt failu

316
 
316
 
317
         if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then
317
         if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then
318
             read_config_param "DEBIAN_REPO"
318
             read_config_param "DEBIAN_REPO"
319
-            CHECK_MESSAGE=$"Check your internet connection, /etc/network/interfaces and /var/run/NetworkManager/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
319
+            CHECK_MESSAGE=$"Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
320
         fi
320
         fi
321
     fi
321
     fi
322
 }
322
 }

+ 1
- 1
src/freedombone-utils-dns Parādīt failu

196
         return
196
         return
197
     fi
197
     fi
198
 
198
 
199
-    resolvconf=/var/run/NetworkManager/resolv.conf
199
+    resolvconf=/etc/resolv.conf
200
 
200
 
201
     # allow changes to resolv.conf
201
     # allow changes to resolv.conf
202
     chattr -i $resolvconf
202
     chattr -i $resolvconf

+ 2
- 2
src/freedombone-utils-onion Parādīt failu

310
     sed -i 's|, domain-name-servers||g' /etc/dhcp/dhclient.conf
310
     sed -i 's|, domain-name-servers||g' /etc/dhcp/dhclient.conf
311
 
311
 
312
     # point resolv.conf to tor
312
     # point resolv.conf to tor
313
-    resolvconf=/var/run/NetworkManager/resolv.conf
313
+    resolvconf=/etc/resolv.conf
314
     chattr -i $resolvconf
314
     chattr -i $resolvconf
315
     echo 'nameserver 127.0.0.1:53' > $resolvconf
315
     echo 'nameserver 127.0.0.1:53' > $resolvconf
316
     chattr +i $resolvconf
316
     chattr +i $resolvconf
378
         /sbin/sysctl -p -q
378
         /sbin/sysctl -p -q
379
     fi
379
     fi
380
 
380
 
381
-    resolvconf=/var/run/NetworkManager/resolv.conf
381
+    resolvconf=/etc/resolv.conf
382
     chattr -i $resolvconf
382
     chattr -i $resolvconf
383
     echo 'domain localdomain' > $resolvconf
383
     echo 'domain localdomain' > $resolvconf
384
     echo 'search localdomain' >> $resolvconf
384
     echo 'search localdomain' >> $resolvconf

+ 1
- 1
src/freedombone-utils-setup Parādīt failu

76
 REMOTE_BACKUPS_LOG=/var/log/remotebackups.log
76
 REMOTE_BACKUPS_LOG=/var/log/remotebackups.log
77
 
77
 
78
 # message if something fails to install
78
 # message if something fails to install
79
-CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /var/run/NetworkManager/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
79
+CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
80
 
80
 
81
 # Default diffie-hellman key length in bits
81
 # Default diffie-hellman key length in bits
82
 DH_KEYLENGTH=2048
82
 DH_KEYLENGTH=2048

+ 1
- 1
src/freedombone-utils-wifi Parādīt failu

466
         fi
466
         fi
467
     done < $WIFI_NETWORKS_FILE
467
     done < $WIFI_NETWORKS_FILE
468
 
468
 
469
-    resolvconf=/var/run/NetworkManager/resolv.conf
469
+    resolvconf=/etc/resolv.conf
470
     chattr -i $resolvconf
470
     chattr -i $resolvconf
471
     systemctl restart network-manager
471
     systemctl restart network-manager
472
     #ifconfig ${WIFI_INTERFACE} up
472
     #ifconfig ${WIFI_INTERFACE} up