4f8ecf273
Denys Vlasenko
2015-10-24
Subject
update network service examples
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
examples/var_service/dhcp_if/convert2ntpconf +1 -1examples/var_service/dhcp_if/dhcp_handler +7 -6examples/var_service/dhcp_if/finish +17 -0examples/var_service/dhcp_if/log/run +1 -1examples/var_service/dhcp_if_pinger/run +2 -2examples/var_service/ftpd/log/run +1 -1examples/var_service/fw/run +1 -1examples/var_service/httpd/log/run +1 -1examples/var_service/ifplugd_if/log/run +1 -1examples/var_service/ifplugd_if/run +3 -0examples/var_service/inetd/log/run +1 -1examples/var_service/ntpd/log/run +1 -1examples/var_service/ntpd/run +1 -1examples/var_service/tftpd/log/run +1 -1examples/var_service/zcip_if/finish +13 -0examples/var_service/zcip_if/log/run +1 -1examples/var_service/zcip_if/zcip_handler +2 -1
examples/var_service/dhcp_if/convert2ntpconf+1 -1
| @@ -29,6 +29,6 @@ test "$ip" || exit 1 | |
| { | |
| for n in $ntpsrv; do | |
| echo "let cfg=cfg+1" | |
| - | echo "ntpip[\$cfg]='$n'"; |
| + | echo "ntpip[\$cfg]='$n'" |
| done | |
| } >"$1" | |
examples/var_service/dhcp_if/dhcp_handler+7 -6
| @@ -36,7 +36,7 @@ service=${PWD##*/} | |
| file_ipconf="$service.ipconf" | |
| file_ntpconf="$service.ntpconf" | |
| dir_ipconf="/var/run/service/fw" | |
| - | dir_ntpconf="/var/run/service/ntp" |
| + | dir_ntpconf="/var/run/service/ntpd" |
| exec >/dev/null | |
| #exec >>"$0.out" #debug | |
| @@ -47,7 +47,7 @@ echo "`date`: Params: $*" | |
| if test x"$1" != x"bound" && test x"$1" != x"renew" ; then | |
| # Reconfigure network with this interface disabled | |
| echo "Deconfiguring" | |
| - | rm "$service.out" |
| + | rm "env.out" |
| rm "$file_ipconf" | |
| rm "$file_ntpconf" | |
| rm "$dir_ipconf/$file_ipconf" | |
| @@ -57,7 +57,8 @@ if test x"$1" != x"bound" && test x"$1" != x"renew" ; then | |
| fi | |
| # Bound: we've got the lease | |
| - | #env >"$service.out" # debug |
| + | # Record information for e.g. dhcp_$IF_pinger service |
| + | env >"env.out" |
| ./convert2ipconf "$file_ipconf" | |
| # Reconfigure routing and firewall if needed | |
| @@ -69,7 +70,7 @@ if test $? != 0; then | |
| sv u /var/service/fw | |
| fi | |
| - | if test -d /var/service/ntp; then |
| + | if test -d /var/service/ntpd; then |
| ./convert2ntpconf "$file_ntpconf" | |
| # Reconfigure ntp server addresses if needed | |
| diff --brief "$file_ntpconf" "$dir_ntpconf/$file_ntpconf" >/dev/null 2>&1 | |
| @@ -77,7 +78,7 @@ if test -d /var/service/ntp; then | |
| echo "Reconfiguring ntp" | |
| mkdir -p "$dir_ntpconf" 2>/dev/null | |
| cp "$file_ntpconf" "$dir_ntpconf/$file_ntpconf" | |
| - | sv t /var/service/ntp |
| - | sv u /var/service/ntp |
| + | sv t /var/service/ntpd |
| + | sv u /var/service/ntpd |
| fi | |
| fi | |
examples/var_service/dhcp_if/finish+17 -0
| @@ -0,0 +1,17 @@ | |
| + | #!/bin/sh |
| + | # executed when service is taken down ("sv d .") |
| + | |
| + | service=${PWD##*/} |
| + | file_ipconf="$service.ipconf" |
| + | file_ntpconf="$service.ntpconf" |
| + | dir_ipconf="/var/run/service/fw" |
| + | dir_ntpconf="/var/run/service/ntpd" |
| + | |
| + | # Reconfigure network with this interface disabled |
| + | echo "Finish: deconfiguring" |
| + | rm "env.out" |
| + | rm "$file_ipconf" |
| + | rm "$file_ntpconf" |
| + | rm "$dir_ipconf/$file_ipconf" |
| + | rm "$dir_ntpconf/$file_ntpconf" |
| + | sv u /var/service/fw |
examples/var_service/dhcp_if/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/dhcp_if_pinger/run+2 -2
| @@ -21,9 +21,9 @@ if test -f "$0.log"; then | |
| mv "$0.log.new" "$0.log" | |
| fi | |
| - | test -f "/var/service/dhcp_$if/dhcp_$if.out" || exec env - sleep "$ping_time" |
| + | test -f "/var/service/dhcp_$if/env.out" || exec env - sleep "$ping_time" |
| - | . "/var/service/dhcp_$if/dhcp_$if.out" |
| + | . "/var/service/dhcp_$if/env.out" |
| test x"$router" != x"" || exec env - sleep "$ping_time" | |
| #msg "Pinging $router" | |
examples/var_service/ftpd/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/fw/run+1 -1
| @@ -62,7 +62,7 @@ umask 077 | |
| # Make sure rundir/ exists | |
| mkdir -p "$rundir" 2>/dev/null | |
| - | chown -R "$user:" "$rundir" |
| + | chown -R "$user": "$rundir" |
| chmod -R a=rX "$rundir" | |
| rm -rf rundir 2>/dev/null | |
| ln -s "$rundir" rundir | |
examples/var_service/httpd/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/ifplugd_if/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/ifplugd_if/run+3 -0
| @@ -8,6 +8,9 @@ pwd="$PWD" | |
| if="${PWD##*/ifplugd_}" | |
| + | echo "* Upping iface $if" |
| + | ip link set dev "$if" up |
| + | |
| echo "* Starting ifplugd on $if [$$]" | |
| exec \ | |
| env - PATH="$PATH" \ | |
examples/var_service/inetd/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/ntpd/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/ntpd/run+1 -1
| @@ -15,7 +15,7 @@ default_p_opt="-p 0.$pool -p 1.$pool -p 2.$pool -p 3.$pool" | |
| # Make sure rundir/ exists | |
| mkdir -p "$rundir" 2>/dev/null | |
| - | chown -R "$user:" "$rundir" |
| + | chown -R "$user": "$rundir" |
| chmod -R a=rX "$rundir" | |
| rm -rf rundir 2>/dev/null | |
| ln -s "$rundir" rundir | |
examples/var_service/tftpd/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/zcip_if/finish+13 -0
| @@ -0,0 +1,13 @@ | |
| + | #!/bin/sh |
| + | # executed when service is taken down ("sv d .") |
| + | |
| + | service=${PWD##*/} |
| + | file_ipconf="$service.ipconf" |
| + | dir_ipconf="/var/run/service/fw" |
| + | |
| + | # Reconfigure network with this interface disabled |
| + | echo "Finish: deconfiguring" |
| + | rm "env.out" |
| + | rm "$file_ipconf" |
| + | rm "$dir_ipconf/$file_ipconf" |
| + | sv u /var/service/fw |
examples/var_service/zcip_if/log/run+1 -1
| @@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`" | |
| mkdir -p "$logdir" 2>/dev/null | |
| chown -R "$user": "$logdir" | |
| chmod -R go-rwxst,u+rwX "$logdir" | |
| - | rm logdir |
| + | rm -rf logdir |
| ln -s "$logdir" logdir | |
| # make this dir accessible to logger | |
examples/var_service/zcip_if/zcip_handler+2 -1
| @@ -33,7 +33,8 @@ if test x"$1" != x"config"; then | |
| fi | |
| # "config": we've got the address | |
| - | #env # debug |
| + | # Record information for e.g. dhcp_$IF_pinger service |
| + | env >"env.out" |
| ./convert2ipconf "$file_ipconf" | |
| # Reconfigure routing and firewall if needed | |