File pihole-disable-features.patch of Package pi-hole
Index: pi-hole-6.4.2/advanced/bash-completion/pihole.bash
===================================================================
--- pi-hole-6.4.2.orig/advanced/bash-completion/pihole.bash
+++ pi-hole-6.4.2/advanced/bash-completion/pihole.bash
@@ -3,7 +3,7 @@
# Bash completion script for pihole
#
_pihole() {
- local cur prev prev2 opts opts_lists opts_checkout opts_debug opts_logging opts_query opts_update opts_networkflush
+ local cur prev prev2 opts opts_lists opts_debug opts_logging opts_query opts_update opts_networkflush
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -11,17 +11,13 @@ _pihole() {
case "${prev}" in
"pihole")
- opts="allow allow-regex allow-wild deny checkout debug disable enable flush help logging query repair regex reloaddns reloadlists setpassword status tail uninstall updateGravity updatePihole version wildcard networkflush api"
+ opts="allow allow-regex allow-wild deny disable enable flush help logging query repair regex reloaddns reloadlists setpassword status tail uninstall updateGravity version wildcard networkflush api"
mapfile -t COMPREPLY < <(compgen -W "${opts}" -- "${cur}")
;;
"allow"|"deny"|"wildcard"|"regex"|"allow-regex"|"allow-wild")
opts_lists="\not \--delmode \--quiet \--list \--help"
mapfile -t COMPREPLY < <(compgen -W "${opts_lists}" -- "${cur}")
;;
- "checkout")
- opts_checkout="core ftl web master dev"
- mapfile -t COMPREPLY < <(compgen -W "${opts_checkout}" -- "${cur}")
- ;;
"debug")
opts_debug="-a"
mapfile -t COMPREPLY < <(compgen -W "${opts_debug}" -- "${cur}")
@@ -34,22 +30,10 @@ _pihole() {
opts_query="--partial --all"
mapfile -t COMPREPLY < <(compgen -W "${opts_query}" -- "${cur}")
;;
- "updatePihole"|"-up")
- opts_update="--check-only"
- mapfile -t COMPREPLY < <(compgen -W "${opts_update}" -- "${cur}")
- ;;
"networkflush")
opts_networkflush="--arp"
mapfile -t COMPREPLY < <(compgen -W "${opts_networkflush}" -- "${cur}")
;;
- "core"|"web"|"ftl")
- if [[ "$prev2" == "checkout" ]]; then
- opts_checkout="master development"
- mapfile -t COMPREPLY < <(compgen -W "${opts_checkout}" -- "${cur}")
- else
- return 1
- fi
- ;;
*)
return 1
;;
Index: pi-hole-6.4.2/pihole
===================================================================
--- pi-hole-6.4.2.orig/pihole
+++ pi-hole-6.4.2/pihole
@@ -387,6 +387,10 @@ statusFunc() {
exit 0
}
+systemdFunc() {
+ # Show systemd status
+ systemctl status pihole-FTL.service pihole-logrotate.timer pihole-updateGravity.timer
+}
tailFunc() {
# Warn user if Pi-hole's logging is disabled
local logging_enabled
@@ -514,10 +518,7 @@ Options:
Add '-h' for more info on logging usage
-q, query Query the adlists for a specified domain
Add '-h' for more info on query usage
- -up, updatePihole Update Pi-hole subsystems
- Add '--check-only' to exit script before update is performed.
-v, version Show installed versions of Pi-hole, Web Interface & FTL
- uninstall Uninstall Pi-hole from your system
status Display the running status of Pi-hole subsystems
enable Enable Pi-hole subsystems
Add '-h' for more info on enable usage
@@ -525,8 +526,6 @@ Options:
Add '-h' for more info on disable usage
reloaddns Update the lists and flush the cache without restarting the DNS server
reloadlists Update the lists WITHOUT flushing the cache or restarting the DNS server
- checkout Switch Pi-hole subsystems to a different GitHub branch
- Add '-h' for more info on checkout usage
networkflush Flush information stored in Pi-hole's network tables
Add '--arp' to additionally flush the ARP table ";
exit 0
@@ -557,17 +556,12 @@ case "${1}" in
# we need to add all arguments that require sudo power to not trigger the * argument
"-f" | "flush" ) need_root=true;;
- "-up" | "updatePihole" ) need_root=true;;
- "-r" | "repair" ) need_root=true;;
"-l" | "logging" ) need_root=true;;
- "uninstall" ) need_root=true;;
"-d" | "debug" ) need_root=true;;
"-g" | "updateGravity" ) need_root=true;;
"reloaddns" ) need_root=true;;
"reloadlists" ) need_root=true;;
"setpassword" ) need_root=true;;
- "checkout" ) need_root=true;;
- "updatechecker" ) need_root=true;;
"arpflush" ) need_root=true;; # Deprecated, use networkflush instead
"networkflush" ) need_root=true;;
"-t" | "tail" ) need_root=true;;
@@ -602,7 +596,6 @@ case "${1}" in
"reloadlists" ) reloadDNS "reload-lists";;
"setpassword" ) SetWebPassword "$@";;
"checkout" ) piholeCheckoutFunc "$@";;
- "updatechecker" ) shift; updateCheckFunc "$@";;
"arpflush" ) arpFunc "$@";; # Deprecated, use networkflush instead
"networkflush" ) networkFlush "$@";;
"-t" | "tail" ) tailFunc "$2";;