--- alx-src/trunk/tinyalxconfig-ng/functions/config_network.sh 2008/06/04 18:37:17 398 +++ alx-src/trunk/tinyalxconfig-ng/functions/config_network.sh 2008/06/05 17:21:37 447 @@ -1,4 +1,4 @@ -# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_network.sh,v 1.5 2008-06-04 18:37:17 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_network.sh,v 1.7 2008-06-05 17:21:37 niro Exp $ # configures networkin on the host via mysql db settings get_network_settings() @@ -90,17 +90,6 @@ # remove all old nics and modules configs find /etc/conf.d -type f -name 'net.*' | xargs rm - find /etc/modules.d -type f -name 'net.*' | xargs rm - - # update the preliminary network - # set an device alias for modprobe.conf - [ ! -d /etc/modules.d ] && install -d /etc/modules.d - # update only if not the same (to speed up bootprocess - no depmod) - if [ ! -f /etc/modules.d/net.${iface} ] || - [[ ${iface} != $(cat /etc/modules.d/net.${iface} | cut -d' ' -f2) ]] - then - echo "alias ${iface} ${ALX_MODULE}" > /etc/modules.d/net.${iface} - fi # update confd-networking default iface [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH} @@ -151,15 +140,6 @@ echo "nameserver ${ALX_DNS}" > /etc/resolv.conf fi -# have no samba anymore -# # setup smb.conf (little sed magic:) -# # first get smb version ! -# local smbconf -# [[ $(smbd --version | cut -d' ' -f2) > 2.999 ]] && smbconf=smb3.conf || smbconf=smb.conf -# -# cat ${ALX_SKELETONS}/samba/${smbconf} > /etc/samba/smb.conf -# sed -i -e "s:\(workgroup = \).*:\1${ALX_DOMAIN}:" /etc/samba/smb.conf - # wireless extensions local value local var