Magellan Linux

Diff of /trunk/initscripts/systemd/units/scripts/network.sh

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

revision 1378 by niro, Sat Jun 4 22:39:03 2011 UTC revision 1665 by niro, Fri Jan 20 23:01:04 2012 UTC
# Line 2  Line 2 
2  # $Id$  # $Id$
3  # Magellan network configuration script for systemd  # Magellan network configuration script for systemd
4    
5    # get default settings
6    source /etc/conf.d/network
7    
8  # read values from files  # read values from files
9  read_value()  read_value()
10  {  {
# Line 85  checkconfig() Line 88  checkconfig()
88   if [[ -z ${NETMASK} ]]   if [[ -z ${NETMASK} ]]
89   then   then
90   echo -n "NETMASK missing in net.${iface}, "   echo -n "NETMASK missing in net.${iface}, "
91   echo "using 255.255.255.0"   echo "using ${DEFAULT_NETMASK}"
92   NETMASK=255.255.255.0   NETMASK="${DEFAULT_NETMASK}"
93   fi   fi
94    
95   if [[ -z ${BROADCAST} ]]   if [[ -z ${BROADCAST} ]]
# Line 100  checkconfig() Line 103  checkconfig()
103   if [[ -z ${DHCP_PROG} ]]   if [[ -z ${DHCP_PROG} ]]
104   then   then
105   echo -n "DHCP_PROG missing in net.${iface},"   echo -n "DHCP_PROG missing in net.${iface},"
106   echo "using default programm /sbin/dhcpcd"   echo "using default programm ${DEFAULT_DHCP_PROG}"
107   DHCP_PROG="/sbin/dhcpcd"   DHCP_PROG="${DEFAULT_DHCP_PROG}"
108   fi   fi
109   [[ -z ${DHCP_START} ]] && DHCP_START="-t 10"   [[ -z ${DHCP_START} ]] && DHCP_START="${DEFAULT_DHCP_START}"
110   [[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k"   [[ -z ${DHCP_STOP} ]] && DHCP_STOP="${DEFAULT_DHCP_STOP}"
111   ;;   ;;
112    
113   esac   esac
# Line 201  config_wireless_wpa() Line 204  config_wireless_wpa()
204   fi   fi
205    
206   # remove old state dir   # remove old state dir
207   [ -d /var/run/wpa_supplicant ] && rm -rf /var/run/wpa_supplicant   [ -d /run/wpa_supplicant ] && rm -rf /run/wpa_supplicant
208    
209   # now run the wpa_supplicant dameon   # now run the wpa_supplicant dameon
210   wpa_supplicant -B \   wpa_supplicant -B \
# Line 552  networking_stop() Line 555  networking_stop()
555   done   done
556    
557   # remove state dir   # remove state dir
558   if [ -d /var/run/wpa_supplicant ]   if [ -d /run/wpa_supplicant ]
559   then   then
560   rm -rf /var/run/wpa_supplicant   rm -rf /run/wpa_supplicant
561   fi   fi
562    
563   # delete user routes   # delete user routes

Legend:
Removed from v.1378  
changed lines
  Added in v.1665