diff --git a/acpid.changes b/acpid.changes index 6df5584..aeef164 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 30 16:12:33 CEST 2007 - seife@suse.de + +- fix "--skip-unsupported" warnings on module load (b.n.c #295308) + ------------------------------------------------------------------- Tue Jul 3 20:03:59 CEST 2007 - seife@suse.de diff --git a/acpid.spec b/acpid.spec index db92c77..f4f3e92 100644 --- a/acpid.spec +++ b/acpid.spec @@ -13,7 +13,7 @@ Name: acpid URL: http://acpid.sourceforge.net/ Version: 1.0.6 -Release: 1 +Release: 8 %define acpi_version 0.09 License: GPL v2 or later Group: System/Daemons @@ -116,6 +116,8 @@ rm -f -- var/lib/acpi/* %dir %attr(0750, root, root) /var/lib/acpi %changelog +* Mon Jul 30 2007 - seife@suse.de +- fix "--skip-unsupported" warnings on module load (b.n.c #295308) * Tue Jul 03 2007 - seife@suse.de - update to version 1.0.6 mostly our patches included upstream diff --git a/rcacpid b/rcacpid index 0a6fd6d..3d50efb 100644 --- a/rcacpid +++ b/rcacpid @@ -80,7 +80,6 @@ esac [ -f /etc/sysconfig/powersave/common ] && . /etc/sysconfig/powersave/common [ -f /etc/sysconfig/acpi ] && . /etc/sysconfig/acpi -[ -f /etc/sysconfig/hardware/config ] && . /etc/sysconfig/hardware/config [ -f /etc/sysconfig/powersave/cpufreq ] && . /etc/sysconfig/powersave/cpufreq case "$1" in @@ -112,20 +111,11 @@ case "$1" in rc_status -v fi else - if [ "$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" != yes ] ; then - echo "acpid: will skip unsupported modules" - MODPROBE_OPTS=--skip-unsupported - else - echo "acpid: will not skip unsupported modules" - fi - if [ /boot/vmlinuz -ot "$ACPI_LAPTOP_MODULES_FILE" ]; then - # We do respect LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY for probed modules. - echo -n "acpid: loading ACPI laptop modules ( " # Load modules defined by system probe while read m; do - grep -wq $m /proc/modules || { modprobe $MODPROBE_OPTS -s $m && echo -n "$m " || rc_status; } + grep -wq $m /proc/modules || { modprobe -s $m && echo -n "$m " || rc_status; } done < $ACPI_LAPTOP_MODULES_FILE echo -n ") " rc_status -v