Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development

Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/webpage.sh
This commit is contained in:
Adam Warner 2017-06-29 19:47:32 +01:00
commit 22abbffbb7
No known key found for this signature in database
GPG key ID: 03843F6C65554B22

View file

@ -213,6 +213,10 @@ SetExcludeClients() {
change_setting "API_EXCLUDE_CLIENTS" "${args[2]}"
}
Halt(){
nohup bash -c "sleep 5; halt" &> /dev/null </dev/null &
}
Reboot() {
nohup bash -c "sleep 5; reboot" &> /dev/null </dev/null &
}
@ -457,6 +461,7 @@ main() {
"setdns" ) SetDNSServers;;
"setexcludedomains" ) SetExcludeDomains;;
"setexcludeclients" ) SetExcludeClients;;
"halt" ) Halt;;
"reboot" ) Reboot;;
"restartdns" ) RestartDNS;;
"setquerylog" ) SetQueryLogOptions;;