--- trunk/initscripts/systemd/units/scripts/network.sh 2011/06/04 22:39:52 1381 +++ trunk/initscripts/systemd/units/scripts/network.sh 2011/06/04 22:43:57 1382 @@ -2,6 +2,9 @@ # $Id$ # Magellan network configuration script for systemd +# get default settings +source /etc/conf.d/network + # read values from files read_value() { @@ -85,8 +88,8 @@ if [[ -z ${NETMASK} ]] then echo -n "NETMASK missing in net.${iface}, " - echo "using 255.255.255.0" - NETMASK=255.255.255.0 + echo "using ${DEFAULT_NETMASK}" + NETMASK="${DEFAULT_NETMASK}" fi if [[ -z ${BROADCAST} ]] @@ -100,11 +103,11 @@ if [[ -z ${DHCP_PROG} ]] then echo -n "DHCP_PROG missing in net.${iface}," - echo "using default programm /sbin/dhcpcd" - DHCP_PROG="/sbin/dhcpcd" + echo "using default programm ${DEFAULT_DHCP_PROG}" + DHCP_PROG="${DEFAULT_DHCP_PROG}" fi - [[ -z ${DHCP_START} ]] && DHCP_START="-t 10" - [[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k" + [[ -z ${DHCP_START} ]] && DHCP_START="${DEFAULT_DHCP_START}" + [[ -z ${DHCP_STOP} ]] && DHCP_STOP="${DEFAULT_DHCP_STOP}" ;; esac