--- alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings 2008/06/05 19:13:31 457 +++ alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings 2008/06/05 19:15:05 458 @@ -11,7 +11,7 @@ #%before: #%after: -# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.11 2008-06-05 17:23:38 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.12 2008-06-05 19:14:54 niro Exp $ # checks first if the client was already configured and if it has an valid serial # if not it runs the autoconfiguration script @@ -45,7 +45,6 @@ ALX_HW_DETECT=false ALX_FORCED_RECHECK=false ALX_RESET_SETTINGS=false -ALX_CONFD_NETWORKING=false # unset vars which may kill us unset ALX_SERIAL ALX_STATE @@ -99,13 +98,6 @@ { local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE - if [[ -f ${SETTINGSPATH}/confd-networking ]] - then - ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)" - else - ALX_IFACE="eth0" - fi - # check if serial file exists if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]] then @@ -642,7 +634,6 @@ case $1 in start) # check for global overrides - [ -f ${SETTINGSPATH}/confd-networking ] && ALX_CONFD_NETWORKING=true [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true