diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 9b61837e6f94c25e76e18a4fc0bee21d3b08730d..5240112a0a3c23616a67d32ab4be67e6aad23881 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -243,7 +243,7 @@ iface eth0 inet static fi # configure DNS - resolvconf=$rootdir/var/run/NetworkManager/resolv.conf + resolvconf=$rootdir/etc/resolv.conf echo 'domain localdomain' > $resolvconf echo 'search localdomain' >> $resolvconf echo "nameserver $NAMESERVER1" >> $resolvconf diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config index 9ed0e5b2c4a88a8fb2240057573284a188ea25e0..cd4e8742258a1badd48b0f3444944491f881fc04 100755 --- a/src/freedombone-utils-config +++ b/src/freedombone-utils-config @@ -316,7 +316,7 @@ function read_configuration_values { if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then read_config_param "DEBIAN_REPO" - 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." + 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." fi fi } diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns index b939713c6971eaaf345880eaf7bba37a6e508241..2dc6e4449a16251e7196c60b52a2920e7a32a660 100755 --- a/src/freedombone-utils-dns +++ b/src/freedombone-utils-dns @@ -196,7 +196,7 @@ function configure_dns { return fi - resolvconf=/var/run/NetworkManager/resolv.conf + resolvconf=/etc/resolv.conf # allow changes to resolv.conf chattr -i $resolvconf diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion index 5f760ec98bc8145e803236d788ca66bb3626771b..112ae85d8c02d230b463a4ea8126b0d8c631d2b6 100755 --- a/src/freedombone-utils-onion +++ b/src/freedombone-utils-onion @@ -310,7 +310,7 @@ function resolve_dns_via_tor { sed -i 's|, domain-name-servers||g' /etc/dhcp/dhclient.conf # point resolv.conf to tor - resolvconf=/var/run/NetworkManager/resolv.conf + resolvconf=/etc/resolv.conf chattr -i $resolvconf echo 'nameserver 127.0.0.1:53' > $resolvconf chattr +i $resolvconf @@ -378,7 +378,7 @@ function route_outgoing_traffic_through_tor { /sbin/sysctl -p -q fi - resolvconf=/var/run/NetworkManager/resolv.conf + resolvconf=/etc/resolv.conf chattr -i $resolvconf echo 'domain localdomain' > $resolvconf echo 'search localdomain' >> $resolvconf diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index c8850afc6de3613b9977f11b6baf1734d926d04f..887907dd2d9209ca557c4aad86a5cd90fc22c2ff 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -76,7 +76,7 @@ COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt REMOTE_BACKUPS_LOG=/var/log/remotebackups.log # message if something fails to install -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." +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." # Default diffie-hellman key length in bits DH_KEYLENGTH=2048 diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi index 6486f3443df5ccc366ac235cc70138c1f02d038f..a3994af5a8ccf308138890c24855345c402dff9c 100755 --- a/src/freedombone-utils-wifi +++ b/src/freedombone-utils-wifi @@ -466,7 +466,7 @@ function networks_from_file { fi done < $WIFI_NETWORKS_FILE - resolvconf=/var/run/NetworkManager/resolv.conf + resolvconf=/etc/resolv.conf chattr -i $resolvconf systemctl restart network-manager #ifconfig ${WIFI_INTERFACE} up