forked from freifunk-franken/firmware
fff-layer3: Make it easier to keep the settings in testmode
On call -t we write the pid on /tmp/configure-layer3-pid. If the script exits from user we use trap to run the new function keep_changes() If the connections to the router lost, the user can run configure-layer3 -k after reconnect to keep changes manually Signed-off-by: Christian Dresel <freifunk@dresel.systems>
This commit is contained in:
parent
7e552761f6
commit
ac6e876581
|
@ -66,15 +66,34 @@ revert_changes() {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keep_changes() {
|
||||||
|
if [ -f "/tmp/configure-layer3-pid" ]; then
|
||||||
|
echo "Keep changes"
|
||||||
|
kill -9 $(cat /tmp/configure-layer3-pid)
|
||||||
|
rm /tmp/configure-layer3-pid
|
||||||
|
# we need exit because trap in test_changes() don't stop the script here and run in test_changes() after trap in the revert code
|
||||||
|
exit
|
||||||
|
else
|
||||||
|
echo "configure-layer3 -t is not running"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
test_changes() {
|
test_changes() {
|
||||||
|
echo $$ > /tmp/configure-layer3-pid
|
||||||
|
trap keep_changes SIGINT SIGTERM
|
||||||
|
|
||||||
reload_services
|
reload_services
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
echo "Configuration reloaded. Changes will be reverted in 200s."
|
|
||||||
echo "Kill this script to keep changes."
|
|
||||||
sleep 200
|
|
||||||
echo "Reverting changes.."
|
|
||||||
|
|
||||||
|
echo "Configuration reloaded. Changes will be reverted in 200s."
|
||||||
|
echo "Kill this script or use configure-layer3 -k to keep changes."
|
||||||
|
|
||||||
|
sleep 200
|
||||||
|
|
||||||
|
echo "Reverting changes.."
|
||||||
|
# on revert we must delete the pid-file
|
||||||
|
rm /tmp/configure-layer3-pid
|
||||||
revert_changes
|
revert_changes
|
||||||
reload_services
|
reload_services
|
||||||
}
|
}
|
||||||
|
@ -86,6 +105,7 @@ usage() {
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -c: configure. No commit, no restart!"
|
echo " -c: configure. No commit, no restart!"
|
||||||
echo " -t: test changes. Restarts services, waits up to 200s for SIGINT"
|
echo " -t: test changes. Restarts services, waits up to 200s for SIGINT"
|
||||||
|
echo " -k: keep changes from test mode"
|
||||||
echo " -a: apply changes"
|
echo " -a: apply changes"
|
||||||
echo " -r: revert changes"
|
echo " -r: revert changes"
|
||||||
}
|
}
|
||||||
|
@ -98,6 +118,7 @@ fi
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-c) configure ;;
|
-c) configure ;;
|
||||||
-t) test_changes ;;
|
-t) test_changes ;;
|
||||||
|
-k) keep_changes ;;
|
||||||
-a) apply_changes ;;
|
-a) apply_changes ;;
|
||||||
-r) revert_changes ;;
|
-r) revert_changes ;;
|
||||||
*) usage; exit 1 ;;
|
*) usage; exit 1 ;;
|
||||||
|
|
Loading…
Reference in New Issue