--- alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/16 11:07:22	2121
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/16 11:08:31	2122
@@ -302,7 +302,7 @@
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
 			echo "WARNING: only importing settings for interface [ ${iface} ] !"
 			source ${network_settings}/net.${iface} || exit 1
-			NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"
+			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
 			mysqldo "insert into cfg_network(
 				hostname,
@@ -475,7 +475,7 @@
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
 			echo "WARNING: only importing settings for interface [ ${iface} ] !"
 			source ${network_settings}/net.${iface} || exit 1
-			NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"
+			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
 			mysqldo "update cfg_network set
 					hostname='${ALX_DEFAULT_HOSTNAME}',
@@ -758,13 +758,10 @@
 		rm -rf /etc/alxconfig-ng/state
 
 		# clear all printers & net-shares
-		:> /etc/cups/printers.conf
-		:> /etc/samba/smb.conf
+		:> /etc/printcap
 
-		# remove inetd, cups & smb from init
-		rc-config del inetd &> /dev/null
-		rc-config del cups &> /dev/null
-		rc-config del samba &> /dev/null
+		# remove lprng
+		rc-config del lprng &> /dev/null
 
 		# remove all user settings
 		[ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
@@ -774,7 +771,7 @@
 
 		# 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
+		find /etc/modprobe.d -type f -name 'net.*' | xargs rm
 
 		# restore default networking
 		cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0