--- alx-src/trunk/tinyalxconfig-ng/functions/config_network.sh 2008/06/04 18:19:44 394 +++ alx-src/trunk/tinyalxconfig-ng/functions/config_network.sh 2008/06/04 18:37:17 398 @@ -1,4 +1,4 @@ -# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_network.sh,v 1.3 2008-06-04 18:19:44 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_network.sh,v 1.5 2008-06-04 18:37:17 niro Exp $ # configures networkin on the host via mysql db settings get_network_settings() @@ -75,7 +75,7 @@ get_network_settings if ! check_network_settings then - ${WARNING} "Could not retrieve network settings, doing nothing ..." + echo -e "${COLYELLOW}Could not retrieve network settings, doing nothing ...${COLDEFAULT}" return 1 fi @@ -151,13 +151,14 @@ echo "nameserver ${ALX_DNS}" > /etc/resolv.conf fi - # 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 +# 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