mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-09-20 17:11:17 +08:00
Alpine: Add some additional dependencies and minor script fixes
Signed-off-by: Michael Ziminsky (Z) <mgziminsky@users.noreply.github.com>
This commit is contained in:
@ -778,7 +778,7 @@ process_status(){
|
|||||||
:
|
:
|
||||||
else
|
else
|
||||||
# non-Docker system
|
# non-Docker system
|
||||||
if service "${i}" status | grep -E 'is\srunning' &> /dev/null; then
|
if service "${i}" status | grep -q -E 'is\srunning|started'; then
|
||||||
status_of_process="active"
|
status_of_process="active"
|
||||||
else
|
else
|
||||||
status_of_process="inactive"
|
status_of_process="inactive"
|
||||||
|
@ -86,6 +86,7 @@ if [[ "$*" == *"once"* ]]; then
|
|||||||
if [[ "$*" != *"quiet"* ]]; then
|
if [[ "$*" != *"quiet"* ]]; then
|
||||||
echo -ne " ${INFO} Running logrotate ..."
|
echo -ne " ${INFO} Running logrotate ..."
|
||||||
fi
|
fi
|
||||||
|
mkdir -p "${STATEFILE%/*}"
|
||||||
/usr/sbin/logrotate --force --state "${STATEFILE}" /etc/pihole/logrotate
|
/usr/sbin/logrotate --force --state "${STATEFILE}" /etc/pihole/logrotate
|
||||||
else
|
else
|
||||||
# Handle rotation for each log file
|
# Handle rotation for each log file
|
||||||
@ -115,4 +116,3 @@ else
|
|||||||
echo -e "${OVER} ${TICK} Deleted ${deleted} queries from long-term query database"
|
echo -e "${OVER} ${TICK} Deleted ${deleted} queries from long-term query database"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -167,12 +167,14 @@ PIHOLE_META_DEPS_APK=(
|
|||||||
dialog
|
dialog
|
||||||
git
|
git
|
||||||
grep
|
grep
|
||||||
iproute2-ss
|
iproute2-minimal # piholeARPTable.sh
|
||||||
|
iproute2-ss # piholeDebug.sh
|
||||||
jq
|
jq
|
||||||
libcap
|
libcap
|
||||||
logrotate
|
logrotate
|
||||||
|
lscpu # piholeDebug.sh
|
||||||
|
lshw # piholeDebug.sh
|
||||||
ncurses
|
ncurses
|
||||||
nmap-ncat
|
|
||||||
procps-ng
|
procps-ng
|
||||||
psmisc
|
psmisc
|
||||||
shadow
|
shadow
|
||||||
|
Reference in New Issue
Block a user