Magellan Linux

Diff of /trunk/initscripts/sysvinit/rc/network

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 931 by niro, Thu Nov 5 12:57:14 2009 UTC revision 1258 by niro, Fri Mar 11 17:34:34 2011 UTC
# Line 64  read_value() Line 64  read_value()
64    
65   local BRIDGE_INTERFACES   local BRIDGE_INTERFACES
66   local BRIDGE_STP   local BRIDGE_STP
67     local BRIDGE_AGEING_TIME
68     local BRIDGE_PRIORITY
69     local BRIDGE_FORWARD_DELAY
70     local BRIDGE_HELLO_TIME
71     local BRIDGE_MAX_MESSAGE_AGE
72     local BRIDGE_PATH_COST
73     local BRIDGE_PORT_PRIORITY
74    
75   source ${file}   source ${file}
76   eval value=\$$(echo ${var})   eval value=\$$(echo ${var})
# Line 74  checkconfig() Line 81  checkconfig()
81  {  {
82   if [[ -z ${NETWORKING} ]]   if [[ -z ${NETWORKING} ]]
83   then   then
84   echo "NETWORKING missing in net.${interface}, aborted"   rc_echo "NETWORKING missing in net.${iface}, aborted"
85   exit 1   exit 1
86   fi   fi
87    
# Line 82  checkconfig() Line 89  checkconfig()
89   static)   static)
90   if [[ -z ${IP} ]]   if [[ -z ${IP} ]]
91   then   then
92   echo "IP missing in net.${interface}, aborted"   rc_echo "IP missing in net.${iface}, aborted"
93   exit 1   exit 1
94   fi   fi
95    
96   if [[ -z ${NETMASK} ]]   if [[ -z ${NETMASK} ]]
97   then   then
98   echo -n "NETMASK missing in net.${interface}, "   rc_echo -n "NETMASK missing in net.${iface}, "
99   echo "using 255.255.255.0"   rc_echo "using 255.255.255.0"
100   NETMASK=255.255.255.0   NETMASK=255.255.255.0
101   fi   fi
102    
103   if [[ -z ${BROADCAST} ]]   if [[ -z ${BROADCAST} ]]
104   then   then
105   echo -n "BROADCAST missing in net.${interface}, "   rc_echo -n "BROADCAST missing in net.${iface}, "
106   echo "using default address"   rc_echo "using default address"
107   fi   fi
108   ;;   ;;
109    
110   dhcp)   dhcp)
111   if [[ -z ${DHCP_PROG} ]]   if [[ -z ${DHCP_PROG} ]]
112   then   then
113   echo "DHCP_PROG missing in net.${interface}, aborted"   rc_echo -n "DHCP_PROG missing in net.${iface},"
114   exit 1   rc_echo "using default programm /sbin/dhcpcd"
115     DHCP_PROG="/sbin/dhcpcd"
116   fi   fi
117     [[ -z ${DHCP_START} ]] && DHCP_START="-t 10"
118     [[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k"
119   ;;   ;;
120    
121   esac   esac
# Line 121  onboot_interface_list() Line 131  onboot_interface_list()
131   # get list of all devices   # get list of all devices
132   for file in $@   for file in $@
133   do   do
134     iface="$(basename ${file} | sed s/net.//)"
135    
136     # exclude backup files and exclude net.routes and net.sample too
137     case "${iface}" in
138     *~) continue ;;
139     routes) continue ;;
140     sample) continue ;;
141     esac
142    
143   if [[ $(read_value ONBOOT ${file}) = yes ]]   if [[ $(read_value ONBOOT ${file}) = yes ]]
144   then   then
145   iface="$(basename ${file} | sed s/net.//)"   devices="${devices} ${iface}"
  # exclude backup files and exclude net.routes too  
  case "${iface}" in  
  *~) ;;  
  */net.routes) ;;  
  *) devices="${devices} $(basename ${file} | sed s/net.//)" ;;  
  esac  
146   fi   fi
147   done   done
148    
# Line 142  config_wireless_wep() Line 155  config_wireless_wep()
155    
156   if [[ -z ${iface} ]]   if [[ -z ${iface} ]]
157   then   then
158   echo "WEP: no \$iface given. Aborting setup."   rc_echo "WEP: no \$iface given. Aborting setup."
159   return 1   return 1
160   fi   fi
161    
162   ${CURS_UP}   ${CURS_UP}
163   ${SET_WWCOL}   ${SET_WWCOL}
164   echo "[AUTH: WEP]"   rc_echo "[AUTH: WEP]"
165    
166   iwconfig "${iface}" enc on   iwconfig "${iface}" enc on
167   [[ -n ${WIRELESS_KEY_LENGTH} ]] && iwconfig "${iface}" enc "${WIRELESS_KEY_LENGTH}"   [[ -n ${WIRELESS_KEY_LENGTH} ]] && iwconfig "${iface}" enc "${WIRELESS_KEY_LENGTH}"
# Line 162  config_wireless_wpa() Line 175  config_wireless_wpa()
175    
176   if [[ -z ${iface} ]]   if [[ -z ${iface} ]]
177   then   then
178   echo "WPA: no \$iface given. Aborting setup."   rc_echo "WPA: no \$iface given. Aborting setup."
179   return 1   return 1
180   fi   fi
181    
182   if [ ! -x /sbin/wpa_supplicant ]   if [ ! -x /sbin/wpa_supplicant ]
183   then   then
184   echo "WPA: wpa_supplicant not installed. Aborting setup."   rc_echo "WPA: wpa_supplicant not installed. Aborting setup."
185   return 1   return 1
186   fi   fi
187    
188   ${CURS_UP}   ${CURS_UP}
189   ${SET_WWCOL}   ${SET_WWCOL}
190   echo "[AUTH: WPA]"   rc_echo "[AUTH: WPA]"
191    
192   # get default settings   # get default settings
193   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant
# Line 217  config_wireless_wpa() Line 230  config_wireless_wpa()
230   ${WIRELESS_WPA_OPTS}   ${WIRELESS_WPA_OPTS}
231    
232   # echo wait 5 seconds   # echo wait 5 seconds
233   echo "    Waiting 5 seconds to retrieve authentification reply ... "   rc_echo "    Waiting 5 seconds to retrieve authentification reply ... "
234   sleep 5   sleep 5
235  }  }
236    
# Line 227  setup_wireless_extensions() Line 240  setup_wireless_extensions()
240    
241   if [[ -z ${iface} ]]   if [[ -z ${iface} ]]
242   then   then
243   echo "WIRELESS_EXTENSIONS: no \$iface given. Aborting setup."   rc_echo "WIRELESS_EXTENSIONS: no \$iface given. Aborting setup."
244   return 1   return 1
245   fi   fi
246    
# Line 239  setup_wireless_extensions() Line 252  setup_wireless_extensions()
252   [[ -n ${WIRELESS_NICK} ]] ||   [[ -n ${WIRELESS_NICK} ]] ||
253   [[ -n ${WIRELESS_AUTH_MODE} ]]   [[ -n ${WIRELESS_AUTH_MODE} ]]
254   then   then
255   echo -e ${COLOREDSTAR}"Setting up wlan-ext for ${COLBLUE}${iface}${COLDEFAULT} ... "   rc_print "Setting up wlan-ext for ${COLBLUE}${iface}${COLDEFAULT} ... "
256   fi   fi
257    
258   [[ -n ${WIRELESS_BITRATE} ]] && iwconfig "${iface}" rate "${WIRELESS_BITRATE}"   [[ -n ${WIRELESS_BITRATE} ]] && iwconfig "${iface}" rate "${WIRELESS_BITRATE}"
# Line 256  setup_wireless_extensions() Line 269  setup_wireless_extensions()
269   esac   esac
270  }  }
271    
272    config_bridge_options()
273    {
274     local iface="$1"
275     local i
276     local port
277     local cost
278     local prio
279    
280     # enable spanning-tree protocol
281     case ${BRIDGE_STP} in
282     on|off) brctl stp "${iface}" "${BRIDGE_STP}" ;;
283     *) rc_echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;
284     esac
285    
286     # configure ageing time
287     if [[ ! -z ${BRIDGE_AGEING_TIME} ]]
288     then
289     brctl setageing "${iface}" "${BRIDGE_AGEING_TIME}"
290     fi
291    
292     # configure bridge priority
293     if [[ ! -z ${BRIDGE_PRIORITY} ]]
294     then
295     brctl setbridgeprio "${iface}" "${BRIDGE_PRIORITY}"
296     fi
297    
298     # configure forward delay
299     if [[ ! -z ${BRIDGE_FORWARD_DELAY} ]]
300     then
301     brctl setfd "${iface}" "${BRIDGE_FORWARD_DELAY}"
302     fi
303    
304     # configure hello time
305     if [[ ! -z ${BRIDGE_HELLO_TIME} ]]
306     then
307     brctl sethello "${iface}" "${BRIDGE_HELLO_TIME}"
308     fi
309    
310     # configure maximal message age
311     if [[ ! -z ${BRIDGE_MAX_MESSAGE_AGE} ]]
312     then
313     brctl setmaxage "${iface}" "${BRIDGE_MAX_MESSAGE_AGE}"
314     fi
315    
316     # configure path cost for every port
317     if [[ ! -z ${BRIDGE_PATH_COST} ]]
318     then
319     for i in ${BRIDGE_PATH_COST}
320     do
321     port="${i%=*}"
322     cost="${i#*=}"
323     [[ ! -z ${port} ]] && brctl pathcost "${iface}" "${port}" "${cost}"
324     done
325     fi
326    
327     # configure port priority for every port
328     if [[ ! -z ${BRIDGE_PORT_PRIORITY} ]]
329     then
330     for i in ${BRIDGE_PORT_PRIORITY}
331     do
332     port="${i%=*}"
333     prio="${i#*=}"
334     [[ ! -z ${port} ]] && brctl setportprio "${iface}" "${port}" "${prio}"
335     done
336     fi
337    }
338    
339  config_bridge_devices()  config_bridge_devices()
340  {  {
341   local iface="$1"   local iface="$1"
# Line 264  config_bridge_devices() Line 344  config_bridge_devices()
344    
345   if [[ -z ${iface} ]]   if [[ -z ${iface} ]]
346   then   then
347   echo "BRIDGE: no \$iface given. Aborting setup."   rc_echo "BRIDGE: no \$iface given. Aborting setup."
348   return 1   return 1
349   fi   fi
350    
351   if [[ -z ${method} ]]   if [[ -z ${method} ]]
352   then   then
353   echo "BRIDGE: no \$method given. Aborting setup."   rc_echo "BRIDGE: no \$method given. Aborting setup."
354   return 1   return 1
355   fi   fi
356    
357   # first check for brctl   # first check for brctl
358   if [[ -z $(which brctl) ]]   if [[ -z $(which brctl) ]]
359   then   then
360   echo "brctl not found! Please install 'net-misc/bridge-utils'."   rc_echo "brctl not found! Please install 'net-misc/bridge-utils'."
361   return 1   return 1
362   fi   fi
363    
364   # check the config   # check the config
365   if [[ -z ${BRIDGE_INTERFACES} ]]   if [[ -z ${BRIDGE_INTERFACES} ]]
366   then   then
367   echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."   rc_echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."
368   return 1   return 1
369   fi   fi
370    
371   case ${method} in   case ${method} in
372   add)   add)
373   # setup the bridge device   # setup the bridge device
374   brctl addbr ${iface}   brctl addbr "${iface}"
375   for bport in ${BRIDGE_INTERFACES}   for bport in ${BRIDGE_INTERFACES}
376   do   do
377   # enter promiscous mode   # enter promiscous mode
378   ifconfig ${bport} 0.0.0.0 promisc   ifconfig "${bport}" 0.0.0.0 promisc
379   # now setup the bridge   # now setup the bridge
380   brctl addif ${iface} ${bport}   brctl addif "${iface}" "${bport}"
381   done   done
382   # enable spanning-tree protocol   # configure all other options
383   case ${BRIDGE_STP} in   config_bridge_options "${iface}"
  on|off) brctl stp ${iface} ${BRIDGE_STP} ;;  
  *) echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;  
  esac  
384   ;;   ;;
385    
386   remove)   remove)
387   for bport in ${BRIDGE_INTERFACE}   for bport in ${BRIDGE_INTERFACE}
388   do   do
389   # bring the interface down   # bring the interface down
390   ifconfig ${bport} down   ifconfig "${bport}" down
391   # remove the interface from the bridge   # remove the interface from the bridge
392   brctl delif ${iface} ${bport}   brctl delif "${iface}" "${bport}"
393   done   done
394   # bring the bridge down   # bring the bridge down
395   brctl delbr ${iface}   brctl delbr "${iface}"
396   ;;   ;;
397   esac   esac
398    
# Line 331  config_routes() Line 408  config_routes()
408    
409   # only add and del are allowed   # only add and del are allowed
410   case ${method} in   case ${method} in
411   add) message="Adding route ${COLBLUE}${route}${COLDEFAULT} ..." ;;   add) message="Adding" ;;
412   del) message="Removing route ${COLBLUE}${route}${COLDEFAULT} ..." ;;   del) message="Removing" ;;
413   *)   *)
414   echo "config_routes: unsupported \$method '${method}'."   rc_echo "config_routes: unsupported \$method '${method}'."
415   exit 1   exit 1
416   ;;   ;;
417   esac   esac
# Line 348  config_routes() Line 425  config_routes()
425   case "${route}" in   case "${route}" in
426   \#*|"") continue ;;   \#*|"") continue ;;
427   esac   esac
428   echo -e ${COLOREDSTAR}"${message}"   rc_print "${message} route ${COLBLUE}${route}${COLDEFAULT} ..."
429   route ${method} ${route}   # do not esacpe ${route} or it breaks!
430     route "${method}" ${route}
431   evaluate_retval   evaluate_retval
432   done   done
433   fi   fi
# Line 361  networking_start() Line 439  networking_start()
439    
440   if [[ -z $1 ]]   if [[ -z $1 ]]
441   then   then
442   ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)   ALL_INTERFACES=$(onboot_interface_list ${rc_network_settings}/net.*)
443   else   else
444   if [[ -e ${network_settings}/net.$1 ]]   if [[ -e ${rc_network_settings}/net.$1 ]]
445   then   then
446   ALL_INTERFACES="$1"   ALL_INTERFACES="$1"
447   else   else
448   ${FAILURE}   ${FAILURE}
449   echo "Interface $1 does not exist. Aborting"   rc_echo "Interface $1 does not exist. Aborting"
450   ${NORMAL}   ${NORMAL}
451   exit 1   exit 1
452   fi   fi
# Line 378  networking_start() Line 456  networking_start()
456   for iface in ${ALL_INTERFACES}   for iface in ${ALL_INTERFACES}
457   do   do
458   # checkconfig   # checkconfig
459   source ${network_settings}/net.${iface} || exit 1   source ${rc_network_settings}/net.${iface} || exit 1
460   checkconfig   checkconfig
461    
462   # setup mac   # setup mac
463   if [ -n "${FORCE_MAC_TO}" ]   if [[ -n ${FORCE_MAC_TO} ]]
464   then   then
465   echo -e ${COLOREDSTAR}"Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "   rc_print "Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "
466   ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"   ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"
467   evaluate_retval   evaluate_retval
468   fi   fi
# Line 392  networking_start() Line 470  networking_start()
470   # setup bridges   # setup bridges
471   if [[ ${iface} = br[0-9]* ]]   if [[ ${iface} = br[0-9]* ]]
472   then   then
473   config_bridge_devices ${iface} add   config_bridge_devices "${iface}" add
474   fi   fi
475    
476   # now configure wireless_extensions   # now configure wireless_extensions
477   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"
478    
479   echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
480    
481   # activate the interface   # activate the interface
482   ifconfig "${iface}" up   ifconfig "${iface}" up
# Line 408  networking_start() Line 486  networking_start()
486   dhcp|DHCP)   dhcp|DHCP)
487   ${CURS_UP}   ${CURS_UP}
488   ${SET_WWCOL}   ${SET_WWCOL}
489   echo "[DHCP]"   rc_echo "[DHCP]"
490   loadproc ${DHCP_PROG} ${DHCP_START} "${iface}"   loadproc "${DHCP_PROG}" "${DHCP_START}" "${iface}"
491   ;;   ;;
492   static|STATIC)   static|STATIC)
493   ${CURS_UP}   ${CURS_UP}
494   ${SET_WWCOL}   ${SET_WWCOL}
495   echo "[STATIC]"   rc_echo "[STATIC]"
496   ifconfig "${iface}" "${IP}" netmask "${NETMASK}" broadcast "${BROADCAST}"   ifconfig "${iface}" "${IP}" netmask "${NETMASK}" broadcast "${BROADCAST}"
497   evaluate_retval   evaluate_retval
498   ;;   ;;
# Line 423  networking_start() Line 501  networking_start()
501   # setup def gw   # setup def gw
502   if [[ -n ${GATEWAY} ]]   if [[ -n ${GATEWAY} ]]
503   then   then
504   echo -e ${COLOREDSTAR}"Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."
505   route add default gateway ${GATEWAY} metric 1 dev ${iface}   route add default gateway "${GATEWAY}" metric 1 dev "${iface}"
506   evaluate_retval   evaluate_retval
507    
508   unset GATEWAY   unset GATEWAY
509   fi   fi
510    
511   # setup /etc/resolv.conf   # setup /etc/resolv.conf
512     # add given nameserver
513   if [[ -n ${NAMESERVER} ]]   if [[ -n ${NAMESERVER} ]]
514   then   then
515   echo -e ${COLOREDSTAR}"Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."
516    
517   # whipe out the old one   # whipe out the old one
518   echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf   echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf
519     # include head
520     if [ -f /etc/resolv.conf.head ]
521     then
522     cat /etc/resolv.conf.head >> /etc/resolv.conf
523     else
524     echo "# /etc/resolv.conf.head can replace this line" >> /etc/resolv.conf
525     fi
526    
527   for dns in ${NAMESERVER}   for dns in ${NAMESERVER}
528   do   do
529   echo "nameserver ${dns}" >> /etc/resolv.conf   echo "nameserver ${dns}" >> /etc/resolv.conf
530   done   done
531    
532     # include tail
533     if [ -f /etc/resolv.conf.tail ]
534     then
535     cat /etc/resolv.conf.tail >> /etc/resolv.conf
536     else
537     echo "# /etc/resolv.conf.tail can replace this line" >> /etc/resolv.conf
538     fi
539    
540   unset NAMESERVER   unset NAMESERVER
541   fi   fi
542   done   done
# Line 454  networking_stop() Line 549  networking_stop()
549  {  {
550   if [[ -z $1 ]]   if [[ -z $1 ]]
551   then   then
552   ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)   ALL_INTERFACES=$(onboot_interface_list ${rc_network_settings}/net.*)
553   else   else
554   if [[ -e ${network_settings}/net.$1 ]]   if [[ -e ${rc_network_settings}/net.$1 ]]
555   then   then
556   ALL_INTERFACES="$1"   ALL_INTERFACES="$1"
557   else   else
558   ${FAILURE}   ${FAILURE}
559   echo "Interface $1 does not exist. Aborting"   rc_echo "Interface $1 does not exist. Aborting"
560   ${NORMAL}   ${NORMAL}
561   exit 1   exit 1
562   fi   fi
# Line 470  networking_stop() Line 565  networking_stop()
565   # get list of all devices   # get list of all devices
566   for iface in ${ALL_INTERFACES}   for iface in ${ALL_INTERFACES}
567   do   do
568   source ${network_settings}/net.${iface} || exit 1   source ${rc_network_settings}/net.${iface} || exit 1
569   checkconfig   checkconfig
570    
571   if [[ -n ${GATEWAY} ]]   if [[ -n ${GATEWAY} ]]
572   then   then
573   echo -e ${COLOREDSTAR}"Removing default gateway ..."   rc_print "Removing default gateway ..."
574   route del -net default   route del -net default
575   evaluate_retval   evaluate_retval
576   fi   fi
577    
578   echo -e ${COLOREDSTAR}"Bringing down interface ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Bringing down interface ${COLBLUE}${iface}${COLDEFAULT} ..."
579   ifconfig ${iface} down   ifconfig "${iface}" down
580   evaluate_retval   evaluate_retval
581    
582   # remove bridges   # remove bridges
583   if [[ ${iface} = br[0-9]* ]]   if [[ ${iface} = br[0-9]* ]]
584   then   then
585   config_bridge_devices ${iface} remove   config_bridge_devices "${iface}" remove
586   fi   fi
587    
588   # shutdown dhcp-daemon   # shutdown dhcp-daemon
589   if [[ ${NETWORKING} = dhcp ]] && [[ -n $(pidof ${DHCP_PROG}) ]]   if [[ ${NETWORKING} = dhcp ]] && [[ -n $(pidof ${DHCP_PROG}) ]]
590   then   then
591   echo -e ${COLOREDSTAR}"Stopping the dhcp-daemon ..."   rc_print "Stopping the dhcp-daemon ..."
592   ${CURS_UP}   ${CURS_UP}
593   ${SET_WWCOL}   ${SET_WWCOL}
594   echo "[$(basename ${DHCP_PROG})]"   rc_echo "[$(basename ${DHCP_PROG})]"
595   ${DHCP_PROG} ${DHCP_STOP} "${iface}"   if [[ -z ${DHCP_STOP} ]]
596   evaluate_retval   then
597     killproc ${DHCP_PROG}
598     evaluate_retval
599     else
600     ${DHCP_PROG} ${DHCP_STOP} "${iface}"
601     evaluate_retval
602     fi
603   fi   fi
604    
605   # shutdown wpa_supplicant daemon   # shutdown wpa_supplicant daemon
# Line 538  case $1 in Line 639  case $1 in
639   ;;   ;;
640    
641   *)   *)
642   echo "Usage: $0 {start|stop|restart} [interface]"   rc_echo "Usage: $0 {start|stop|restart} [interface]"
643   exit 1   exit 1
644   ;;   ;;
645  esac  esac

Legend:
Removed from v.931  
changed lines
  Added in v.1258