YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Use 'yunohost service start' instead of 'ynh_systemd_action' such that yunohost properly gives the lock to the 'yunohost tools regen-conf' inside the service

Browse source
This commit is contained in:
Alexandre Aubin 2023-10-05 20:34:32 +02:00
parent cf03447866
commit 1d9844f997
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/install
View file

@ -217,7 +217,7 @@ ynh_script_progression --message="Starting a systemd service..."
if [[ $wifi_device == "" ]]; then if [[ $wifi_device == "" ]]; then
echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2 echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2
else else
ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot" yunohost service start $service_name
fi fi
#================================================= #=================================================

2
scripts/restore
View file

@ -126,7 +126,7 @@ fi
if [[ $wifi_device == "" ]]; then if [[ $wifi_device == "" ]]; then
echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2 echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2
else else
ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot" yunohost service start $service_name
fi fi
#================================================= #=================================================

5
scripts/upgrade
View file

@ -58,8 +58,7 @@ ynh_abort_if_errors
# STOP SYSTEMD SERVICE # STOP SYSTEMD SERVICE
#================================================= #=================================================
ynh_script_progression --message="Stopping the hotspot service ... (this may take some time)" ynh_script_progression --message="Stopping the hotspot service ... (this may take some time)"
yunohost service stop $service_name
ynh_systemd_action --service_name=$service_name --action="stop" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
@ -269,7 +268,7 @@ fi
if [[ $wifi_device == "" ]]; then if [[ $wifi_device == "" ]]; then
echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2 echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2
else else
ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot" yunohost service start $service_name
fi fi
#================================================= #=================================================