From c0106011bd1b28d192d7a0f2bebd5cf6bd988534 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sat, 7 Apr 2018 19:53:11 +0200 Subject: Better logger and sound for headless situations --- misc/setup_routing.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/misc/setup_routing.sh b/misc/setup_routing.sh index 3ab551e..7e95b87 100755 --- a/misc/setup_routing.sh +++ b/misc/setup_routing.sh @@ -1,7 +1,9 @@ #!/bin/bash CONF_FILE=/root/config_svc.conf -#export DRY=echo # Dummy mode -export DRY=echo_log_run # Real mode +case $1 in + echo|log_run|echo_log_run) export DRY=$1 ;; + *) export DRY=echo_log_run ;; # Real mode +esac # Copyright 2016 Ludovic Pouzenc # @@ -35,6 +37,9 @@ function main() { cat /etc/ethers.system /etc/ethers.adt > /etc/ethers $DRY ip route flush cache $DRY arp -f /etc/ethers + + # Make to win melody + [ -x /usr/bin/beep ] && beep -f 130 -l 100 -n -f 262 -l 100 -n -f 330 -l 100 -n -f 392 -l 100 -n -f 523 -l 100 -n -f 660 -l 100 -n -f 784 -l 300 -n -f 660 -l 300 -n -f 146 -l 100 -n -f 262 -l 100 -n -f 311 -l 100 -n -f 415 -l 100 -n -f 523 -l 100 -n -f 622 -l 100 -n -f 831 -l 300 -n -f 622 -l 300 -n -f 155 -l 100 -n -f 294 -l 100 -n -f 349 -l 100 -n -f 466 -l 100 -n -f 588 -l 100 -n -f 699 -l 100 -n -f 933 -l 300 -n -f 933 -l 100 -n -f 933 -l 100 -n -f 933 -l 100 -n -f 1047 -l 400 } # do_conf is called for each internet access service to (un)route @@ -51,7 +56,7 @@ function do_conf() { # FIXME sanity checks, code injection here shift - dev=eth1 + dev=br1 case $svc_etat in active) do_conf_enable $dev "$@" ;; @@ -191,7 +196,12 @@ function nat_cleanup() { function echo_log_run() { echo $@ "# ${FUNCNAME[1]}():${BASH_LINENO[0]}" - logger -t "$PROGNAME" -- $@ "# ${FUNCNAME[1]}():${BASH_LINENO[0]}" + logger -p user.debug -t "$PROGNAME" -- $@ "# ${FUNCNAME[1]}():${BASH_LINENO[0]}" + $@ +} + +function log_run() { + logger -p user.debug -t "$PROGNAME" -- $@ "# ${FUNCNAME[1]}():${BASH_LINENO[0]}" $@ } -- cgit v1.1