YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] DNSmasq template generation

Browse source
This commit is contained in:
ljf 2021-11-26 19:39:37 +01:00
parent 321c8dd5ba
commit f34f9e5fc3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/hooks/conf_regen/43-dnsmasq
View file

@ -16,7 +16,6 @@ do_pre_regen() {
# add default conf files # add default conf files
cp plain/etcdefault ${pending_dir}/etc/default/dnsmasq cp plain/etcdefault ${pending_dir}/etc/default/dnsmasq
cp plain/dnsmasq.conf ${pending_dir}/etc/dnsmasq.conf
# add resolver file # add resolver file
cat plain/resolv.dnsmasq.conf | grep "^nameserver" | shuf >${pending_dir}/etc/resolv.dnsmasq.conf cat plain/resolv.dnsmasq.conf | grep "^nameserver" | shuf >${pending_dir}/etc/resolv.dnsmasq.conf
@ -26,9 +25,9 @@ do_pre_regen() {
ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1' ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1'
ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true) ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true)
ynh_validate_ip6 "$ipv6" || ipv6='' ynh_validate_ip6 "$ipv6" || ipv6=''
interfaces="$(ls /sys/class/net)" interfaces="$(ls -m /sys/class/net | sed s/,//g)"
wireless_interfaces="" wireless_interfaces="lo"
for dev in "${interfaces[@]}"; do for dev in $(ls /sys/class/net); do
if [ -d "/sys/class/net/$dev/wireless" ]; then if [ -d "/sys/class/net/$dev/wireless" ]; then
wireless_interfaces+=" $dev" wireless_interfaces+=" $dev"
fi fi