|
@@ -293,12 +293,15 @@ config_editor()
|
|
|
}
|
|
|
}' $3
|
|
|
}
|
|
|
-boot() {
|
|
|
+boot_service() {
|
|
|
config_load "${CONFIGURATION}"
|
|
|
config_get waitonboot $CONFIGURATION waitonboot "0"
|
|
|
if [ "$waitonboot" == "1" ]; then
|
|
|
do_redirect 0
|
|
|
- /usr/share/AdGuardHome/waitnet.sh &
|
|
|
+ procd_open_instance "waitnet"
|
|
|
+ procd_set_param command "/usr/share/AdGuardHome/waitnet.sh"
|
|
|
+ procd_close_instance
|
|
|
+ echo "no net start pinging"
|
|
|
else
|
|
|
start
|
|
|
fi
|
|
@@ -395,7 +398,9 @@ start_service() {
|
|
|
do_redirect 0
|
|
|
config_get "redirect" "AdGuardHome" "redirect" "none"
|
|
|
if [ "$redirect" != "none" ]; then
|
|
|
- /usr/share/AdGuardHome/watchconfig.sh &
|
|
|
+ procd_open_instance "waitconfig"
|
|
|
+ procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
|
|
|
+ procd_close_instance
|
|
|
echo "no config start watching"
|
|
|
fi
|
|
|
fi
|
|
@@ -407,8 +412,6 @@ reload_service()
|
|
|
{
|
|
|
config_load "${CONFIGURATION}"
|
|
|
echo "AdGuardHome reloading"
|
|
|
- pgrep /usr/share/AdGuardHome/watchconfig.sh | xargs kill 2>/dev/null
|
|
|
- pgrep /usr/share/AdGuardHome/waitnet.sh | xargs kill 2>/dev/null
|
|
|
config_get_bool enabled $CONFIGURATION enabled 0
|
|
|
procd_send_signal $CONFIGURATION
|
|
|
if [ "$enabled" == "0" ]; then
|
|
@@ -422,8 +425,6 @@ stop_service()
|
|
|
config_load "${CONFIGURATION}"
|
|
|
do_redirect 0
|
|
|
procd_send_signal $CONFIGURATION
|
|
|
- pgrep /usr/share/AdGuardHome/watchconfig.sh | xargs kill 2>/dev/null
|
|
|
- pgrep /usr/share/AdGuardHome/waitnet.sh | xargs kill 2>/dev/null
|
|
|
config_get backupwd $CONFIGURATION backupwd "0"
|
|
|
if [ "$backupwd" == "1" ]; then
|
|
|
config_get backupwdpath $CONFIGURATION backupwdpath "/usr/bin/AdGuardHome"
|
|
@@ -433,3 +434,9 @@ stop_service()
|
|
|
echo "AdGuardHome turn off"
|
|
|
echo "enabled=$enabled"
|
|
|
}
|
|
|
+boot() {
|
|
|
+ rc_procd boot_service "$@"
|
|
|
+ if eval "type service_started" 2>/dev/null >/dev/null; then
|
|
|
+ service_started
|
|
|
+ fi
|
|
|
+}
|