Commit d71cb8d0 authored by iv's avatar iv

grandenet script: remove some old printed messages.

parent c12aab1e
...@@ -84,17 +84,14 @@ function configure { ...@@ -84,17 +84,14 @@ function configure {
# function to clean up and exit # function to clean up and exit
cleanup() { cleanup() {
echo " echo -e "
#################### Cleaning up ################################# \e[1mCleaning up and exiting...\e[0m"
"
printf "\nCleaning up and exiting...\n"
if [ -r "${configdir}/ip6tables.save" ] ; then if [ -r "${configdir}/ip6tables.save" ] ; then
echo "Removing changes in ip6tables rules" echo "Removing changes in ip6tables rules"
ip6tables-restore < "${configdir}/ip6tables.save" ip6tables-restore < "${configdir}/ip6tables.save"
rm "${configdir}/ip6tables.save" rm "${configdir}/ip6tables.save"
rm "${configdir}/current_ip6tables.conf" rm "${configdir}/current_ip6tables.conf"
fi fi
echo "Stop allowing IPv6 forwarding..."
} }
...@@ -114,11 +111,10 @@ if [[ $(pgrep re6stnet) ]] ; then ...@@ -114,11 +111,10 @@ if [[ $(pgrep re6stnet) ]] ; then
cleanup cleanup
echo "Killing re6stnet process..." echo "Killing re6stnet process..."
killall re6stnet killall re6stnet
# XXX: should only kill other grandenet processes...
killall grandenet
else
echo "Exiting." echo "Exiting."
exit 0 exit 0
else
exit 0
fi fi
fi fi
...@@ -239,7 +235,6 @@ sysctl net.ipv6.conf.all.forwarding=1 >> "${logfile}" 2>&1 ...@@ -239,7 +235,6 @@ sysctl net.ipv6.conf.all.forwarding=1 >> "${logfile}" 2>&1
echo "re6st will start, it may take a few minutes before beeing usable" echo "re6st will start, it may take a few minutes before beeing usable"
echo " echo "
For debugging purpose, logs will be stored in ${logfile}. For debugging purpose, logs will be stored in ${logfile}.
To stop grandenet, run 'sudo ${0##*/}' command again." To stop grandenet, run 'sudo ${0##*/}' command again."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment