interfaces: move searchdomain files to /tmp #5367

This commit is contained in:
Franco Fichtner 2021-11-28 13:25:20 +01:00
parent 713e2469cb
commit cc0b1b3be9
6 changed files with 8 additions and 8 deletions

View File

@ -1116,8 +1116,8 @@ function interface_bring_down($interface = "wan", $ifacecfg = false)
/* clear stale state files associated with this interface */
@unlink("/var/etc/nameserver_{$realif}");
@unlink("/var/etc/nameserver_v6{$realifv6}");
@unlink("/var/etc/searchdomain_{$realif}");
@unlink("/var/etc/searchdomain_v6{$realifv6}");
@unlink("/tmp/searchdomain_{$realif}");
@unlink("/tmp/searchdomain_v6{$realifv6}");
@unlink("/tmp/{$realif}_router");
@unlink("/tmp/{$realifv6}_routerv6");
@unlink("/tmp/{$realifv6}_pdinfo");

View File

@ -6,5 +6,5 @@
/bin/rm -f /tmp/${1}_routerv6
/bin/rm -f /var/etc/nameserver_v6${1}
/bin/rm -f /var/etc/nameserver_${1}
/bin/rm -f /var/etc/searchdomain_${1}
/bin/rm -f /var/etc/searchdomain_v6${1}
/bin/rm -f /tmp/searchdomain_${1}
/bin/rm -f /tmp/searchdomain_v6${1}

View File

@ -311,7 +311,7 @@ function get_searchdomains()
{
$master_list = array();
$search_list = glob('/var/etc/searchdomain_*');
$search_list = glob('/tmp/searchdomain_*');
if (is_array($search_list)) {
foreach ($search_list as $fdns) {

View File

@ -75,7 +75,7 @@ if (!is_ipaddr($ip) && substr($interface_real, 0, 4) != 'ovpn') {
return;
}
$searchdomain_file = "/var/etc/searchdomain_v6{$interface_real}";
$searchdomain_file = "/tmp/searchdomain_v6{$interface_real}";
$nameserver_file = "/var/etc/nameserver_v6{$interface_real}";
$new_domain_name_servers = getenv('new_domain_name_servers');

View File

@ -154,7 +154,7 @@ fi
mkdir -p /var/etc
# clear nameserver, searchdomain and IP cache files
rm -f /var/etc/nameserver_* /var/etc/searchdomain_*
rm -f /var/etc/nameserver_*
# Clear all files in this directory to prevent stale state of
# services. At one point this also helped to prevent shutdown(8)

View File

@ -234,7 +234,7 @@ add_new_resolv_conf() {
route add $nameserver -iface $interface
fi
done
echo $new_domain_name >/var/etc/searchdomain_$interface
echo $new_domain_name > /tmp/searchdomain_$interface
fi
return 0