mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 14:58:08 +00:00
Merging
This commit is contained in:
commit
5d842a7533
@ -139,7 +139,6 @@ function ModifyHostFile(){
|
||||
function Reload() {
|
||||
# Reload hosts file
|
||||
echo "** Refresh lists in dnsmasq..."
|
||||
|
||||
dnsmasqPid=$(pidof dnsmasq)
|
||||
|
||||
if [[ $dnsmasqPid ]]; then
|
||||
|
@ -172,8 +172,8 @@ function gravity_Blacklist(){
|
||||
blacklist.sh -f -nr -q
|
||||
}
|
||||
|
||||
function gravity_Whitelist() {
|
||||
|
||||
function gravity_Whitelist() {
|
||||
# Prevent our sources from being pulled into the hole
|
||||
plural=; [[ "${sources[@]}" != "1" ]] && plural=s
|
||||
echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
|
||||
@ -243,7 +243,6 @@ function gravity_advanced() {
|
||||
function gravity_reload() {
|
||||
# Reload hosts file
|
||||
echo "** Refresh lists in dnsmasq..."
|
||||
|
||||
dnsmasqPid=$(pidof dnsmasq)
|
||||
|
||||
if [[ $dnsmasqPid ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user