2323
2424log ()
2525{
26- logger -I $$ -t udhcpc -p user.notice " $* "
26+ logger -I $$ -t udhcpc -p user.notice " ${interface} : $* "
27+ }
28+
29+ dbg ()
30+ {
31+ logger -I $$ -t udhcpc -p user.debug " ${interface} : $* "
32+ }
33+
34+ err ()
35+ {
36+ logger -I $$ -t udhcpc -p user.err " ${interface} : $* "
2737}
2838
2939wait_for_ipv6_default_route ()
3040{
31- log " waiting for IPv6 default route to be installed."
41+ dbg " waiting for IPv6 default route to be installed."
3242 while [ $IF_WAIT_DELAY -gt 0 ]; do
3343 if ip -6 route list proto dhcp dev $interface | grep -q default; then
3444 return
@@ -37,7 +47,7 @@ wait_for_ipv6_default_route()
3747 printf " ."
3848 : $(( IF_WAIT_DELAY -= 1 ))
3949 done
40- log " Timed out witing for IPv6 default route!"
50+ err " Timed out waiting for IPv6 default route!"
4151}
4252
4353# RFC3442: If the DHCP server returns both a Classless
@@ -50,7 +60,7 @@ set_dhcp_routes()
5060 # format: dest1/mask gw1 ... destn/mask gwn
5161 set -- $staticroutes
5262 while [ -n " $1 " -a -n " $2 " ]; do
53- log " adding route $1 via $2 metric $metric tag 100"
63+ dbg " adding route $1 via $2 metric $metric tag 100"
5464 echo " ip route $1 $2 $metric tag 100" >> " $NEXT "
5565 shift 2
5666 done
@@ -69,7 +79,7 @@ set_dhcp_routes()
6979
7080clr_dhcp_routes ()
7181{
72- log " deleting DHCP routes from $interface "
82+ log " deleting DHCP routes"
7383 [ -f " $NAME " ] || return
7484 rm " $NAME "
7585
@@ -84,7 +94,7 @@ clr_dhcp_addresses()
8494 for addr in $addrs ; do
8595 ip=" $( echo " $addr " | jq -r ' ."local"' ) "
8696 prefix=" $( echo " $addr " | jq -r ' ."prefixlen"' ) "
87- log " removing $ip /$prefix from $interface "
97+ log " removing $ip /$prefix "
8898 ip addr del " $ip /$prefix " dev " $interface "
8999 done
90100}
@@ -142,20 +152,20 @@ case "$ACTION" in
142152 fi
143153
144154 if [ -n " $search_list " ]; then
145- log " adding search $search_list "
155+ dbg " adding search $search_list "
146156 echo " search $search_list # $interface " >> $RESOLV_CONF
147157 fi
148158
149159 for i in $dns ; do
150- log " adding dns $i "
160+ dbg " adding dns $i "
151161 echo " nameserver $i # $interface " >> $RESOLV_CONF
152162 resolvconf -u
153163 done
154164
155165 if [ -n " $ntpsrv " ]; then
156166 truncate -s 0 " $NTPFILE "
157167 for srv in $ntpsrv ; do
158- log " got NTP server $srv "
168+ dbg " got NTP server $srv "
159169 echo " server $srv iburst" >> " $NTPFILE "
160170 done
161171 chronyc reload sources > /dev/null
0 commit comments