--- trunk/hwinfo/emulate-hwsetup.sh	2010/11/22 11:37:48	1197
+++ trunk/hwinfo/emulate-hwsetup.sh	2011/05/09 15:16:13	1320
@@ -2,9 +2,20 @@
 
 export LC_ALL=C
 
-HWSETUP_DIR=/etc/sysconfig/hwsetup
+HWSETUP_DIR=/etc/conf.d/hwsetup
 HWINFO="/usr/sbin/hwinfo"
 
+UNSUPPORTED_GFXCARD_DRIVERS=""
+UNSUPPORTED_NETCARD_DRIVERS=""
+if [ -f ${HWSETUP_DIR}/unsupported-gfxcard-drivers ]
+then
+	UNSUPPORTED_GFXCARD_DRIVERS="$(< ${HWSETUP_DIR}/unsupported-gfxcard-drivers)"
+fi
+if [ -f ${HWSETUP_DIR}/unsupported-netcard-drivers ]
+then
+	UNSUPPORTED_NETCARD_DRIVERS="$(< ${HWSETUP_DIR}/unsupported-netcard-drivers)"
+fi
+
 clearconfig()
 {
 	local file="$1"
@@ -19,6 +30,38 @@
 	echo "${data}" >> ${HWSETUP_DIR}/${file}
 }
 
+# check_unsupported_netcard_drivers UNSUPPORTED_ARRAY DRIVER
+check_unsupported_drivers()
+{
+	local unsupported="$1"
+	local driver="$2"
+	local i
+
+	# filter unsupported devices
+	for i in ${unsupported}
+	do
+		[[ ${i} = ${driver} ]] && return 1
+	done
+	return 0
+}
+
+# disable probeonly, load all modules by default
+probeonly=0
+
+# check getops
+for i in $*
+do
+	case $1 in
+		# ignoring -p,-v,-a,-s
+		-p|-v|-a|-s) shift;;
+		# only support dry-run
+		-n) shift; probeonly=1 ;;
+	esac
+	shift
+done
+
+echo -n "Autoconfiguring devices...  " 1>&2
+
 GFXCARD_INFO="$(${HWINFO} --gfxcard)"
 NETCARD_INFO="$(${HWINFO} --netcard)"
 MOUSE_INFO="$(${HWINFO} --mouse)"
@@ -34,6 +77,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\":')\))
@@ -56,6 +101,15 @@
 
 for ((i=0; i<GFXCARD_COUNT; i++))
 do
+	# fallback to vesa
+	if [[ -z ${GFXCARD_MODULE[${i}]} ]]
+	then
+		GFXCARD_MODULE[${i}]="vesa"
+	fi
+
+	# exclude unsupported drivers
+	check_unsupported_drivers "${UNSUPPORTED_GFXCARD_DRIVERS}" "${NETCARD_MODULE[${i}]}" || continue
+
 	addconfig xserver "XSERVER=\"${GFXCARD_XSERVER}\"" 
 	addconfig xserver "XMODULE=\"${GFXCARD_MODULE[${i}]}\""
 	addconfig xserver "XDESC=\"${GFXCARD_DESC[${i}]}\""
@@ -64,16 +118,40 @@
 	addconfig knoppix "XSERVER=\"${GFXCARD_XSERVER}\"" 
 	addconfig knoppix "XMODULE=\"${GFXCARD_MODULE[${i}]}\""
 	addconfig knoppix "XDESC=\"${GFXCARD_DESC[${i}]}\""
+
+	# load some needed modules for xorg-servers without udev or hal support, which the driver would normally autoload
+	case "${GFXCARD_MODULE[${i}]}" in
+		intel|i810) modprobe -q intel-agp ;;
+		nv) modprobe -q nvidia-agp ;;
+		sis) modprobe -q sis-agp ;;
+		ati|radeon|r128|mach64) modprobe -q ati-agp ;;
+		via|openchrome) modprobe -q via-agp ;;
+	esac
 done
 
 for ((i=0; i<NETCARD_COUNT; i++))
 do
+	# use fallback
+	if [[ -z ${NETCARD_MODULE[${i}]} ]]
+	then
+		NETCARD_MODULE[${i}]="${NETCARD_MODULE_FB[${i}]}"
+	fi
+
+	# exclude unsupported drivers
+	check_unsupported_drivers "${UNSUPPORTED_NETCARD_DRIVERS}" "${NETCARD_MODULE[${i}]}" || continue
+
 	addconfig netcard "FULLNAME=\"${NETCARD_DESC[${i}]}\"" 
 	addconfig netcard "DRIVER=\"${NETCARD_MODULE[${i}]}\""
 
 	# add them to knoppix too
 	addconfig knoppix "NETCARD_FULLNAME=\"${NETCARD_DESC[${i}]}\""
 	addconfig knoppix "NETCARD_DRIVER=\"${NETCARD_MODULE[${i}]}\""
+
+	# load the netcard modules
+	if [[ ${probeonly} = 0 ]]
+	then
+		modprobe -q "${NETCARD_MODULE[${i}]}"
+	fi
 done
 
 for ((i=0; i<MOUSE_COUNT; i++))
@@ -81,10 +159,12 @@
 	# fix mouseproto to be hwsetup compatible (it just guesses the proto :/ )
 	case "${MOUSE_GPM_PROTO[${i}]}" in
 		exps2) MOUSE_GPM_PROTO[${i}]="ps2" ;;
+		"") MOUSE_GPM_PROTO[${i}]="ps2" ;;
 	esac
 	case "${MOUSE_X11_PROTO[${i}]}" in
 		explorerps/2) MOUSE_X11_PROTO[${i}]="IMPS/2" ;;
 		ps/2) MOUSE_X11_PROTO[${i}]="PS/2" ;;
+		"") MOUSE_X11_PROTO[${i}]="PS/2" ;;
 	esac
 
 	addconfig mouse "MOUSETYPE=\"${MOUSE_GPM_PROTO[${i}]}\""
@@ -100,3 +180,5 @@
 	addconfig knoppix "MOUSE_DEVICE=\"${MOUSE_DEVICE[${i}]}\""
 	addconfig knoppix "MOUSE_DRIVER=\"${MOUSE_MODULE[${i}]}\""
 done
+
+echo "Done." 1>&2