Hello community, here is the log from the commit of package acpid checked in at Fri Jun 2 01:28:45 CEST 2006. -------- --- acpid/acpid.changes 2006-02-21 13:04:05.000000000 +0100 +++ acpid/acpid.changes 2006-06-01 16:57:22.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 1 16:33:13 CEST 2006 - thoenig@suse.de + +- rcacpid: do not probe unsupported modules if + LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY is set to yes + (b.n.c #180654) +- rcacpid: be verbose about which modules are being probed or + loaded. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.ZM1mFb/_old 2006-06-02 01:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ZM1mFb/_new 2006-06-02 01:16:51.000000000 +0200 @@ -13,7 +13,7 @@ Name: acpid URL: http://acpid.sourceforge.net/ Version: 1.0.4 -Release: 19 +Release: 29 %define acpi_version 0.09 License: GPL Group: System/Daemons @@ -120,6 +120,12 @@ %dir %attr(0750, root, root) /var/lib/acpi %changelog -n acpid +* Thu Jun 01 2006 - thoenig@suse.de +- rcacpid: do not probe unsupported modules if + LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY is set to yes + (b.n.c #180654) +- rcacpid: be verbose about which modules are being probed or + loaded. * Tue Feb 21 2006 - rw@suse.de - never try laptop modules on ia64 (bug #146291) * Wed Feb 15 2006 - thoenig@suse.de ++++++ rcacpid ++++++ --- acpid/rcacpid 2006-02-21 13:04:05.000000000 +0100 +++ acpid/rcacpid 2006-06-01 16:51:57.000000000 +0200 @@ -82,6 +82,7 @@ [ -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 case "$1" in start) @@ -103,43 +104,64 @@ if [ -n "$ACPI_LAPTOP_MODULES_USER" ]; then if [ "$ACPI_LAPTOP_MODULES_USER" != "NONE" ]; then + echo -n "acpid: loading ACPI laptop modules ( " # Load modules defined by user for m in ${ACPI_LAPTOP_MODULES_USER}; do - grep -wq $m /proc/modules || { modprobe -s $m || rc_status; } + grep -wq $m /proc/modules || { modprobe -s $m && echo -n "$m " || rc_status; } done + echo -n ") " + 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 -s $m || rc_status; } + grep -wq $m /proc/modules || { modprobe $MODPROBE_OPTS -s $m && echo -n "$m " || rc_status; } done < $ACPI_LAPTOP_MODULES_FILE + echo -n ") " + rc_status -v else # First run, or kernel has been updated. We have to probe which - # modules load successfully. - echo -n "acpid: probing laptop ACPI modules " + # modules load successfully. For this, we do respect + # LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY. + + echo "acpid: probing laptop ACPI modules " touch "$ACPI_LAPTOP_MODULES_FILE" for m in $ACPI_LAPTOP_MODULES_PROBE; do - if modprobe -s $m; then - # pcc_acpi and sony_acpi can be loaded always. + if modprobe $MODPROBE_OPTS -s $m; then + # pcc_acpi and sony_acpi can always be loaded. # remove them if the system does not support them. case $m in sony_acpi) if [ ! -r /proc/acpi/sony/brightness ] ; then - rmmod sony_acpi; + grep -wq $m /proc/modules && rmmod sony_acpi; continue fi ;; pcc_acpi) if [ ! -r /proc/acpi/panasonic ] ; then - rmmod pcc_acpi; + grep -wq $m /proc/modules && rmmod pcc_acpi; continue fi ;; esac echo $m >> $ACPI_LAPTOP_MODULES_FILE fi done - - echo -n; + echo -n "acpid: added " + while read m; do + echo -n "$m " + done < $ACPI_LAPTOP_MODULES_FILE + + echo -n "to $ACPI_LAPTOP_MODULES_FILE" rc_status -v; fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org