SliTaz Repositories

     1.1 --- a/tinyutils/tazhw	Sat Jun 04 17:17:21 2016 +0300
     1.2 +++ b/tinyutils/tazhw	Wed Jun 29 10:08:10 2016 +0200
     1.3 @@ -63,20 +63,13 @@
     1.4  load_module() {
     1.5  	if ! lsmod | grep -q "^$mod"; then
     1.6  		# Check if builtin, loaded or missing
     1.7 -		if modprobe $mod 2>/dev/null; then
     1.8 -			if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then
     1.9 -				_ '* Builtin module : %s' "$mod"
    1.10 -				unset mod
    1.11 -			else
    1.12 -				_ '* Loaded module  : %s' "$mod"
    1.13 -			fi
    1.14 +		if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then
    1.15 +			_ '* Builtin module : %s' "$mod"
    1.16 +			unset mod
    1.17 +		elif modprobe $mod 2>/dev/null; then
    1.18 +			_ '* Loaded module  : %s' "$mod"
    1.19  		else
    1.20 -			if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then
    1.21 -				_ '* Builtin module : %s' "$mod"
    1.22 -				unset mod
    1.23 -			else
    1.24 -				_ '! Missing module : %s' "$mod"
    1.25 -			fi
    1.26 +			_ '! Missing module : %s' "$mod"
    1.27  		fi
    1.28  	else
    1.29  		_ '> Module in use  : %s' "$mod"
    1.30 @@ -111,7 +104,7 @@
    1.31  	if [ ! -s /var/lib/detected-modules ]; then
    1.32  		. /etc/rcS.conf
    1.33  		# We need module_name to match output of lsmod.
    1.34 -		list=$(lspci -k | grep 'driver' | cut -d: -f2 | module_name)
    1.35 +		list=$(sed '/^DRIVER=/!d;s/.*=/ /' /sys/bus/pci/devices/*/uevent| module_name)
    1.36  		echo "$list" > /var/lib/detected-modules
    1.37  		for mod in $(sort < /var/lib/detected-modules | uniq)
    1.38  		do
    1.39 @@ -180,8 +173,7 @@
    1.40  		hwsetup $SETUP_OPTIONS ;;
    1.41  	-dm|detected-modules)
    1.42  		title 'Detected PCI and USB modules'
    1.43 -		cat /var/lib/detected-modules
    1.44 -		cat /var/lib/detected-usb-modules 2>/dev/null
    1.45 +		cat /var/lib/detected-modules /var/lib/detected-usb-modules 2>/dev/null
    1.46  		footer ;;
    1.47  	*) 
    1.48  		usage ;;