Ignore:
Timestamp:
Dec 20, 2016, 4:07:32 PM (8 years ago)
Author:
Bruno Cornec
Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:
branches/3.3
Files:
24 added
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/3.3/mindi-busybox/examples/var_service/dhcp_if/convert2ntpconf

    r2725 r3621  
    3030for n in $ntpsrv; do
    3131    echo "let cfg=cfg+1"
    32     echo "ntpip[\$cfg]='$n'";
     32    echo "ntpip[\$cfg]='$n'"
    3333done
    3434} >"$1"

  • branches/3.3/mindi-busybox/examples/var_service/dhcp_if/dhcp_handler

    r2725 r3621  
    3737file_ntpconf="$service.ntpconf"
    3838dir_ipconf="/var/run/service/fw"
    39 dir_ntpconf="/var/run/service/ntp"
     39dir_ntpconf="/var/run/service/ntpd"
    4040
    4141exec >/dev/null
    … …  
    4848    # Reconfigure network with this interface disabled
    4949    echo "Deconfiguring"
    50     rm "$service.out"
     50    rm "env.out"
    5151    rm "$file_ipconf"
    5252    rm "$file_ntpconf"
    … …  
    5858
    5959# Bound: we've got the lease
    60 #env >"$service.out"  # debug
     60# Record information for e.g. dhcp_$IF_pinger service
     61env >"env.out"
    6162
    6263./convert2ipconf "$file_ipconf"
    … …  
    7071fi
    7172
    72 if test -d /var/service/ntp; then
     73if test -d /var/service/ntpd; then
    7374    ./convert2ntpconf "$file_ntpconf"
    7475    # Reconfigure ntp server addresses if needed
    … …  
    7879        mkdir -p "$dir_ntpconf" 2>/dev/null
    7980        cp "$file_ntpconf" "$dir_ntpconf/$file_ntpconf"
    80         sv t /var/service/ntp
    81         sv u /var/service/ntp
     81        sv t /var/service/ntpd
     82        sv u /var/service/ntpd
    8283    fi
    8384fi

  • branches/3.3/mindi-busybox/examples/var_service/dhcp_if/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/dhcp_if_pinger/run

    r2725 r3621  
    11#!/bin/sh
    22
    3 delay=67
    4 
     3# How often to test, seconds
     4ping_time=67
     5# "One ping, must have reply in 1 sec"
     6ping_opts="-c1 -W1 -w1"
     7# If ping failed, how soon to retry
     8retry_time=5
     9# Reinit after this many consecutive ping error
     10max_fail=5
     11# Interface whose DHCP data to use
    512if=${PWD##*/dhcp_}
    613if=${if%%_pinger}
     14
     15msg() {
     16    echo "`date '+%Y-%m-%d %H:%M:%S'` $*" >>"$0.log"
     17}
    718
    819if test -f "$0.log"; then
    … …  
    1122fi
    1223
    13 test -f "/var/service/dhcp_$if/dhcp_$if.out" || exec env - sleep "$delay"
    14 . "/var/service/dhcp_$if/dhcp_$if.out"
    15 test x"$router" != x"" || exec env - sleep "$delay"
     24test -f "/var/service/dhcp_$if/env.out" || exec env - sleep "$ping_time"
    1625
    17 #echo "`date '+%Y-%m-%d %H:%M:%S'` Testing ping -c3 $router" >>"$0.log"
    18 ping -c3 "$router" && exec env - sleep "$delay"
     26. "/var/service/dhcp_$if/env.out"
     27test x"$router" != x"" || exec env - sleep "$ping_time"
    1928
    20 echo "`date '+%Y-%m-%d %H:%M:%S'` Restarting /var/service/dhcp_$if" >>"$0.log"
    21 sv t "/var/service/dhcp_$if"
     29#msg "Pinging $router"
     30failcnt=0
     31while true; do
     32    ping $ping_opts "$router" && exec env - sleep "$ping_time"
     33    : $((failcnt++))
     34    msg "Failed to ping $router, fail count:$failcnt"
     35    test $failcnt -ge $max_fail && break
     36    env - sleep "$retry_time"
     37done
    2238
    23 exec env - sleep "$delay"
     39test -d "/var/service/dhcp_$if" && {
     40    msg "Restarting /var/service/dhcp_$if"
     41    sv t "/var/service/dhcp_$if"
     42}
     43test -d "/var/service/supplicant_$if" && {
     44    msg "Restarting /var/service/supplicant_$if"
     45    sv t "/var/service/supplicant_$if"
     46}
     47exec env - sleep "$ping_time"

  • branches/3.3/mindi-busybox/examples/var_service/ftpd/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/fw/run

    r2725 r3621  
    6363# Make sure rundir/ exists
    6464mkdir -p "$rundir" 2>/dev/null
    65 chown -R "$user:" "$rundir"
     65chown -R "$user": "$rundir"
    6666chmod -R a=rX "$rundir"
    6767rm -rf rundir 2>/dev/null

  • branches/3.3/mindi-busybox/examples/var_service/httpd/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/ifplugd_if/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/ifplugd_if/run

    r2725 r3621  
    88
    99if="${PWD##*/ifplugd_}"
     10
     11echo "* Upping iface $if"
     12ip link set dev "$if" up
    1013
    1114echo "* Starting ifplugd on $if [$$]"

  • branches/3.3/mindi-busybox/examples/var_service/inetd/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/ntpd/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111

  • branches/3.3/mindi-busybox/examples/var_service/ntpd/ntp.script

    r2725 r3621  
    1111dt=`date '+%Y-%m-%d %H:%M:%S'`
    1212
     13echo "`tail -n 199 -- "$0.log" 2>/dev/null`" >"$0.log.$$"
     14
     15if test x"$1" = x"unsync" \
     16; then
     17    # No replies for our NTP requests were seen for some time.
     18    #
     19    # Among more mundate cases like network outages, this happens
     20    # if we ran for a LONG time (days) and ntp server's IP has changed.
     21    # ntpd has no code to re-resolve peers' addresses to IPs,
     22    # we need to help it:
     23    #
     24    echo "$dt: $1"\
     25        "syncronization lost, restarting ntpd"\
     26        >>"$0.log.$$"
     27    mv -- "$0.log.$$" "$0.log"
     28    kill $PPID
     29    exit
     30fi
     31
    1332if test x"$stratum" != x"" \
    1433&& test x"$poll_interval" != x"" \
    … …  
    1635&& test 128 -le "$poll_interval" \
    1736; then
    18     echo "`tail -n 199 -- "$0.log" 2>/dev/null`" >"$0.log.$$"
    1937    echo "$dt: $1"\
    2038        "freq_drift_ppm=$freq_drift_ppm"\
    … …  
    2846fi
    2947
    30 echo "`tail -n 199 -- "$0.log" 2>/dev/null`" >"$0.log.$$"
    3148echo "$dt: $1"\
    3249    "freq_drift_ppm=$freq_drift_ppm"\

  • branches/3.3/mindi-busybox/examples/var_service/ntpd/run

    r2725 r3621  
    1616# Make sure rundir/ exists
    1717mkdir -p "$rundir" 2>/dev/null
    18 chown -R "$user:" "$rundir"
     18chown -R "$user": "$rundir"
    1919chmod -R a=rX "$rundir"
    2020rm -rf rundir 2>/dev/null

  • branches/3.3/mindi-busybox/examples/var_service/tftpd/log/run

    r2725 r3621  
    77chown -R "$user": "$logdir"
    88chmod -R go-rwxst,u+rwX "$logdir"
    9 rm logdir
     9rm -rf logdir
    1010ln -s "$logdir" logdir
    1111
Note: See TracChangeset for help on using the changeset viewer.