--- trunk/hwinfo/emulate-hwsetup.sh	2010/11/22 22:06:20	1198
+++ trunk/hwinfo/emulate-hwsetup.sh	2010/11/22 22:59:53	1200
@@ -19,6 +19,8 @@
 	echo "${data}" >> ${HWSETUP_DIR}/${file}
 }
 
+echo -n "Autoconfiguring devices...  " 1>&2
+
 GFXCARD_INFO="$(${HWINFO} --gfxcard)"
 NETCARD_INFO="$(${HWINFO} --netcard)"
 MOUSE_INFO="$(${HWINFO} --mouse)"
@@ -34,6 +36,8 @@
 # network
 eval $(echo NETCARD_MODULE=\($(echo "${NETCARD_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
 eval $(echo NETCARD_DESC=\($(echo "${NETCARD_INFO}" | grep 'Model:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
+# fallback (only needed for systems without netlink)
+eval $(echo NETCARD_MODULE_FB=\($(echo "${NETCARD_INFO}" | grep 'Driver Activation Cmd:' | sed 's:.*\:\ \"modprobe\ \(.*\)\"$:\"\1\":')\))
 #
 # mouse
 eval $(echo MOUSE_MODULE=\($(echo "${MOUSE_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
@@ -61,7 +65,6 @@
 	then
 		GFXCARD_MODULE[${i}]="vesa"
 	fi
-
 	addconfig xserver "XSERVER=\"${GFXCARD_XSERVER}\"" 
 	addconfig xserver "XMODULE=\"${GFXCARD_MODULE[${i}]}\""
 	addconfig xserver "XDESC=\"${GFXCARD_DESC[${i}]}\""
@@ -74,6 +77,11 @@
 
 for ((i=0; i<NETCARD_COUNT; i++))
 do
+	# use fallback
+	if [[ -z ${NETCARD_MODULE[${i}]} ]]
+	then
+		NETCARD_MODULE[${i}]="${NETCARD_MODULE_FB[${i}]}"
+	fi
 	addconfig netcard "FULLNAME=\"${NETCARD_DESC[${i}]}\"" 
 	addconfig netcard "DRIVER=\"${NETCARD_MODULE[${i}]}\""
 
@@ -108,3 +116,5 @@
 	addconfig knoppix "MOUSE_DEVICE=\"${MOUSE_DEVICE[${i}]}\""
 	addconfig knoppix "MOUSE_DRIVER=\"${MOUSE_MODULE[${i}]}\""
 done
+
+echo "Done." 1>&2