Hello community, here is the log from the commit of package laptop-mode-tools for openSUSE:Factory checked in at 2016-03-26 15:28:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/laptop-mode-tools (Old) and /work/SRC/openSUSE:Factory/.laptop-mode-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "laptop-mode-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/laptop-mode-tools/laptop-mode-tools.changes 2016-02-22 08:57:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.laptop-mode-tools.new/laptop-mode-tools.changes 2016-03-26 17:29:23.000000000 +0100 @@ -1,0 +2,32 @@ +Thu Mar 24 08:47:53 UTC 2016 - [email protected] + +- Fix source url, point to github.com +- Add org.linux.lmt.gui.policy to spec file. +- Add lmt-poll.service to %pre/%post/%preun/%postun. +- Clean-up spec file, require systemd-rpm-macro only if version is + 1315 or higher. +- Update to version 1.69.1: + + Important Bug Fix release. +- Changes from version 1.69: + + Wait for all forked modules to complete + + Add new module: cputhotplug + + CPU online/offine is reverse here + + Fix shell syntax + + Install policykit file + + Detach polling daemon from main process + + Do NOT touch speed if throttling is not set + + Restore to MAX speed when back to AC Power + + Fix manpage about DISABLE_ETHERNET_ON_BATTERY setting + + Update documentation about ENABLE_LAPTOP_MODE_ON_AC setting + + Change powersaving default for USB class devices + + Drop usbhid from default (black)list + + Add usb keyboard driver to the list default list + + Be consistent with passing args to LMT from different invokers + + Honor device plug/unplug events on a per device basis; + like how Chromium initially submitted this patch + + Also be consistent with option in the event parser + + Update links in README.md + + Update new github homepage location + + Add lmt-config-gui shell script + +------------------------------------------------------------------- Old: ---- laptop-mode-tools_1.68.1.tar.gz New: ---- laptop-mode-tools_1.69.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ laptop-mode-tools.spec ++++++ --- /var/tmp/diff_new_pack.YG5KIj/_old 2016-03-26 17:29:24.000000000 +0100 +++ /var/tmp/diff_new_pack.YG5KIj/_new 2016-03-26 17:29:24.000000000 +0100 @@ -20,13 +20,13 @@ %{!?_udevdir:%global _udevdir %{_libexecdir}/udev} Name: laptop-mode-tools -Version: 1.68.1 +Version: 1.69.1 Release: 0 Summary: The Laptop Mode Tools License: GPL-2.0+ Group: System/Base Url: http://www.samwel.tk/laptop_mode/ -Source: http://samwel.tk/laptop_mode/tools/downloads/%{name}_%{version}.tar.gz +Source: https://github.com/rickysarraf/%{name}/releases/download/%{version}/%{name}_%{version}.tar.gz Source1: laptop-mode-tools.pm-utils-hook Source2: README.SUSE Patch1: laptop-mode-1.53-install_sh.diff @@ -38,8 +38,8 @@ BuildRequires: pm-utils %else BuildRequires: systemd -%endif BuildRequires: systemd-rpm-macros +%endif BuildRequires: udev BuildArch: noarch %{?systemd_requires} @@ -82,16 +82,20 @@ %pre %service_add_pre laptop-mode.service +%service_add_pre lmt-poll.service %post %service_add_post laptop-mode.service +%service_add_post lmt-poll.service systemd-tmpfiles --create %{_tmpfilesdir}/laptop-mode.conf %preun %service_del_preun laptop-mode.service +%service_del_preun lmt-poll.service %postun %service_del_postun laptop-mode.service +%service_del_postun lmt-poll.service %files %defattr(-,root,root) @@ -123,6 +127,9 @@ %doc README.SUSE %{_tmpfilesdir}/laptop-mode.conf %{_unitdir}/laptop-mode.service +%dir %{_datadir}/polkit-1 +%dir %{_datadir}/polkit-1/actions +%{_datadir}/polkit-1/actions/org.linux.lmt.gui.policy %if 0%{?suse_version} >= 1315 %{_unitdir}/laptop-mode.timer %{_unitdir}/lmt-poll.service ++++++ laptop-mode-tools_1.68.1.tar.gz -> laptop-mode-tools_1.69.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/Documentation/revision-history.txt new/laptop-mode-tools_1.69.1/Documentation/revision-history.txt --- old/laptop-mode-tools_1.68.1/Documentation/revision-history.txt 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/Documentation/revision-history.txt 2016-03-15 11:35:20.000000000 +0100 @@ -1,3 +1,25 @@ +1.69 - Mon Mar 7 17:44:42 IST 2016 + * Wait for all forked modules to complete + * Add new module: cputhotplug + * CPU online/offine is reverse here + * Fix shell syntax + * Install policykit file + * Detach polling daemon from main process + * Do NOT touch speed if throttling is not set + * Restore to MAX speed when back to AC Power + * Fix manpage about DISABLE_ETHERNET_ON_BATTERY setting + * Update documentation about ENABLE_LAPTOP_MODE_ON_AC setting + * Change powersaving default for USB class devices + * Drop usbhid from default (black)list + * Add usb keyboard driver to the list default list + * Be consistent with passing args to LMT from different invokers + * Honor device plug/unplug events on a per device basis; + like how Chromium initially submitted this patch + * Also be consistent with option in the event parser + * Update links in README.md + * Update new github homepage location + * Add lmt-config-gui shell script + 1.68.1 - Sun Sep 27 14:00:13 IST 2015 * Update details about runtime-pm in manpage * Revert "Drop out reload" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/README.md new/laptop-mode-tools_1.69.1/README.md --- old/laptop-mode-tools_1.68.1/README.md 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/README.md 2016-03-15 11:35:20.000000000 +0100 @@ -28,7 +28,7 @@ * To configure the laptop mode scripts, edit `/etc/laptop-mode/laptop-mode.conf`. -* The laptop mode FAQ can be found at <http://samwel.tk/laptop_mode/faq> +* The laptop mode FAQ can be found at <https://github.com/rickysarraf/laptop-mode-tools/wiki/FAQ> * The revision history is included in the `Documentation` directory. @@ -43,4 +43,4 @@ References ---------- -The laptop mode tools website: <http://samwel.tk/laptop_mode/> +The laptop mode tools website: <http://rickysarraf.github.io/laptop-mode-tools/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/cpuhotplug.conf new/laptop-mode-tools_1.69.1/etc/laptop-mode/conf.d/cpuhotplug.conf --- old/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/cpuhotplug.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/laptop-mode-tools_1.69.1/etc/laptop-mode/conf.d/cpuhotplug.conf 2016-03-15 11:35:20.000000000 +0100 @@ -0,0 +1,36 @@ +# +# Configuration file for Laptop Mode Tools module cpuhotplug. +# +# For more information, consult the laptop-mode.conf(8) manual page. +# + +############################################################################### +# CPU Hot Plugging +# ---------------- +# +#__COMMENT Laptop mode tools can automatically switch off multiple CPU cores +#__COMMENT when switching to battery. +#__COMMENT This can be very useful if your use does not involve CPU intensive +#__COMMENT tasks, while on battery +#__COMMENT +#__COMMENT IMPORTANT: This feature is NOT enabled by default +#__COMMENT +#__COMMENT Enalbe it only if you understand what you are doing +# +############################################################################### + +# Enable debug mode for this module +# Set to 1 if you want to debug this module +DEBUG=0 + +# +# Should laptop mode tools control the CPU Hot Plugging functionality? +# +# Set to 0 to disable +CONTROL_CPU_HOTPLUG=0 + + +# Conditions under which to enable CPU Hot Plugging, i.e. shutdown of the CPU +BATT_CPU_HOTPLUG=1 +LM_AC_CPU_HOTPLUG=0 +NOLM_AC_CPU_HOTPLUG=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/runtime-pm.conf new/laptop-mode-tools_1.69.1/etc/laptop-mode/conf.d/runtime-pm.conf --- old/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/runtime-pm.conf 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/laptop-mode/conf.d/runtime-pm.conf 2016-03-15 11:35:20.000000000 +0100 @@ -42,7 +42,7 @@ # The list of device driver types that should not use autosuspend. The driver # type is given by "DRIVER=..." in a device's uevent file. # Example: AUTOSUSPEND_DEVID_BLACKLIST="usbhid usb-storage" -AUTOSUSPEND_RUNTIME_DEVTYPE_BLACKLIST="" +AUTOSUSPEND_RUNTIME_DEVTYPE_BLACKLIST="hub usbhid usb-storage" # The list of Device IDs that should use autosuspend. Use system commands or # look into sysfs to find out the IDs of your devices. @@ -58,7 +58,7 @@ # Warning: DO NOT CHANGE THESE DEFAUTLS UNLESS YOU KNOW BATT_SUSPEND_RUNTIME=1 LM_AC_SUSPEND_RUNTIME=1 -NOLM_AC_SUSPEND_RUNTIME=1 +NOLM_AC_SUSPEND_RUNTIME=0 # Auto-Suspend timeout in seconds # Number of seconds after which the USB devices should suspend diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/laptop-mode/laptop-mode.conf new/laptop-mode-tools_1.69.1/etc/laptop-mode/laptop-mode.conf --- old/laptop-mode-tools_1.68.1/etc/laptop-mode/laptop-mode.conf 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/laptop-mode/laptop-mode.conf 2016-03-15 11:35:20.000000000 +0100 @@ -81,13 +81,14 @@ # -# Enable laptop mode when on battery power. +# Enable laptop mode power saving, when on battery power. # ENABLE_LAPTOP_MODE_ON_BATTERY=1 # -# Enable laptop mode when on AC power. +# Enable laptop mode power savings, even when on AC power. +# This is useful when running as a headless machine, in low power mode # ENABLE_LAPTOP_MODE_ON_AC=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/rules/99-laptop-mode.rules new/laptop-mode-tools_1.69.1/etc/rules/99-laptop-mode.rules --- old/laptop-mode-tools_1.68.1/etc/rules/99-laptop-mode.rules 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/rules/99-laptop-mode.rules 2016-03-15 11:35:20.000000000 +0100 @@ -1,3 +1,3 @@ ACTION=="change", SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_NAME}=="|AC|ACAD", RUN+="lmt-udev auto" -ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="lmt-udev auto force" +ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="lmt-udev auto" ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="lmt-udev force modules=runtime-pm devices=%k" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/rules/lmt-udev new/laptop-mode-tools_1.69.1/etc/rules/lmt-udev --- old/laptop-mode-tools_1.68.1/etc/rules/lmt-udev 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/rules/lmt-udev 2016-03-15 11:35:20.000000000 +0100 @@ -25,27 +25,35 @@ } +## For Debug only +#export LMT_DEBUG="/tmp/__lmt__debug.txt" +[ -z $LMT_DEBUG ] || rm -f $LMT_DEBUG +## # Under systemd, we don't do synchronous operations, so we can run in the foreground; # And we need also need to run in foreground, because forked children get kill immediately # under systemd/udev -if [ -d /run/systemd/system ]; then +# The seconds "auto" evaluation is to determine if it is a standard execution; +# i.e. a reload/restart or a device plug/unplug + +if [ -d /run/systemd/system ] && [ x$1 = xauto ]; then + [ -z $LMT_DEBUG ] || echo "systemd is $PPID $$ $@" > $LMT_DEBUG exec systemctl --no-block reload-or-restart laptop-mode else # Under sysvinit/upstart, we need to fork as we start the long-running # /usr/sbin/laptop_mode process. # # Also, if this happens during boot, we may want to wait until /usr is available - # This else stanza is going to be used rarely, because going forward we are - # going to use systemd. - # But for compatibility reasons, we'll carry this # # That said, we background the execution here, because, otherwise udevd will wait # for this process which will block - exec > /dev/null 2>dev/null + # This stanza will also be called for device plug/unplug events + + exec > /dev/null 2>/dev/null non_systemd_way "$@" & + [ -z $LMT_DEBUG ] || echo "regulard is $PPID $$ $@" > $LMT_DEBUG fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.service new/laptop-mode-tools_1.69.1/etc/systemd/laptop-mode.service --- old/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.service 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/systemd/laptop-mode.service 2016-03-15 11:35:20.000000000 +0100 @@ -1,15 +1,15 @@ [Unit] Description=Laptop Mode Tools Documentation=man:laptop_mode(8) man:laptop-mode.conf(8) -Documentation=http://samwel.tk/laptop_mode +Documentation=http://github.com/rickysarraf/laptop-mode-tools [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@/usr/sbin/laptop_mode init auto -ExecStop=@/usr/sbin/laptop_mode init stop -ExecStopPost=@/bin/rm -f /var/run/laptop-mode-tools/enabled -ExecReload=@/usr/sbin/laptop_mode auto +ExecStart=/usr/sbin/laptop_mode init auto +ExecStop=/usr/sbin/laptop_mode init stop +ExecStopPost=/bin/rm -f /var/run/laptop-mode-tools/enabled +ExecReload=/usr/sbin/laptop_mode auto StandardOutput=journal StandardError=journal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/etc/systemd/lmt-poll.service new/laptop-mode-tools_1.69.1/etc/systemd/lmt-poll.service --- old/laptop-mode-tools_1.68.1/etc/systemd/lmt-poll.service 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/etc/systemd/lmt-poll.service 2016-03-15 11:35:20.000000000 +0100 @@ -1,13 +1,13 @@ [Unit] Description=Laptop Mode Tools - Battery Polling Service Documentation=man:laptop_mode(8) man:laptop-mode.conf(8) -Documentation=http://samwel.tk/laptop_mode +Documentation=http://github.com/rickysarraf/laptop-mode-tools [Service] Type=oneshot RemainAfterExit=no -ExecStart=/lib/udev/lmt-udev -ExecReload=/lib/udev/lmt-udev +ExecStart=/lib/udev/lmt-udev auto +ExecReload=/lib/udev/lmt-udev auto StandardOutput=journal StandardError=journal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/gui/LMT.py new/laptop-mode-tools_1.69.1/gui/LMT.py --- old/laptop-mode-tools_1.68.1/gui/LMT.py 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/gui/LMT.py 2016-03-15 11:35:20.000000000 +0100 @@ -30,7 +30,7 @@ COMMENT_IDENTIFIER = "#__COMMENT" CONTROL_IDENTIFIER = "CONTROL_" CONFIG_DIR = "/etc/laptop-mode/conf.d" -WEBPAGE_URL = "http://samwel.tk/laptop_mode"; +WEBPAGE_URL = "http://github.com/rickysarraf/laptop-mode-tools"; ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/gui/lmt-config-gui new/laptop-mode-tools_1.69.1/gui/lmt-config-gui --- old/laptop-mode-tools_1.68.1/gui/lmt-config-gui 1970-01-01 01:00:00.000000000 +0100 +++ new/laptop-mode-tools_1.69.1/gui/lmt-config-gui 2016-03-15 11:35:20.000000000 +0100 @@ -0,0 +1,6 @@ +#!/bin/sh + +# Needed for annoying QT MIT bug +export QT_X11_NO_MITSHM=1 + +python2 /usr/share/laptop-mode-tools/lmt.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/install.sh new/laptop-mode-tools_1.69.1/install.sh --- old/laptop-mode-tools_1.68.1/install.sh 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/install.sh 2016-03-15 11:35:20.000000000 +0100 @@ -118,6 +118,7 @@ $INSTALL -d -m 755 "$DESTDIR/usr/share/laptop-mode-tools/module-helpers" $INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d" $INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules" +$INSTALL -d -m 755 "$DESTDIR/usr/share/polkit-1/actions" $INSTALL -d -m 755 "$DESTDIR/usr/sbin" $INSTALL -d -m 755 "$DESTDIR/$UDEV_D/rules.d" $INSTALL -d -m 755 "$DESTDIR/$MAN_D/man8" @@ -154,6 +155,11 @@ exit 11 fi +if ( ! $INSTALL -m 644 usr/share/polkit-1/actions/org.linux.lmt.gui.policy "$DESTDIR/usr/share/polkit-1/actions/" ) ; then + echo "$0: Failed to install $DESTDIR/usr/share/polkit-1/actions/org.linux.lmt.gui.policy Installation failed." + exit 11 +fi + if ( ! $INSTALL -m 755 usr/sbin/lm-syslog-setup "$DESTDIR/usr/sbin" ) ; then echo "$0: Failed to install $DESTDIR/usr/sbin/lm-syslog-setup. installation failed." exit 25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/laptop-mode-tools.spec new/laptop-mode-tools_1.69.1/laptop-mode-tools.spec --- old/laptop-mode-tools_1.68.1/laptop-mode-tools.spec 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/laptop-mode-tools.spec 2016-03-15 11:35:20.000000000 +0100 @@ -3,11 +3,11 @@ Summary: Tools for power savings based on battery/AC status Name: laptop-mode-tools -Version: 1.68.1 +Version: 1.69.1 Release: 1 License: GPL Group: System Environment/Base -URL: http://www.samwel.tk/laptop_mode +URL: http://github.com/rickysarraf/laptop-mode-tools Vendor: Laptop Mode Tools Developers Distribution: RPM Based distributions Packager: Ritesh Raj Sarraf <[email protected]> @@ -85,13 +85,13 @@ %{_sbindir}/* %{_usr}/share/laptop-mode-tools/modules/* %{_usr}/share/laptop-mode-tools/module-helpers/* +%{_usr}/share/polkit-1/actions/org.linux.lmt.gui.policy %{_usr}/lib/pm-utils/sleep.d/* %{_usr}/lib/tmpfiles.d/laptop-mode.conf %dir %{_sysconfdir}/acpi/events %dir %{_sysconfdir}/acpi/actions -%dir %{_usr}/sbin %dir %{_usr}/lib/pm-utils/sleep.d %dir %{_usr}/lib/tmpfiles.d %dir %{_usr}/share/laptop-mode-tools/modules @@ -102,6 +102,12 @@ %changelog +* Tue Mar 15 2016 Ritesh Raj Sarraf <[email protected]> - 1.69.1-1 +- Updated to release 1.69.1 + +* Mon Mar 7 2016 Ritesh Raj Sarraf <[email protected]> - 1.69-1 +- Updated to release 1.69 + * Sun Sep 27 2015 Ritesh Raj Sarraf <[email protected]> - 1.68.1-1 - Updated to release 1.68.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/man/laptop-mode.conf.8 new/laptop-mode-tools_1.69.1/man/laptop-mode.conf.8 --- old/laptop-mode-tools_1.68.1/man/laptop-mode.conf.8 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/man/laptop-mode.conf.8 2016-03-15 11:35:20.000000000 +0100 @@ -85,7 +85,9 @@ These options determine whether laptop mode will be activated when the computer is on battery or on AC power, respectively. Note that if the system service laptop-mode is not started, then laptop mode will never -be started, even if this option is enabled. +be started, even if this option is enabled. + +The ENABLE_LAPTOP_MODE_ON_AC setting is useful when you want to run on a headless machine, in low-power mode, for eg. a Jukebox. .IP "\fBENABLE_LAPTOP_MODE_WHEN_LID_CLOSED\fP" 10 When this option is enabled, laptop mode will be activated when the laptop's lid is @@ -292,8 +294,17 @@ .IP "\fBDISABLE_ETHERNET_ON_BATTERY\fP" 10 Set this to 1 if you want to completely disable your ethernet device when running on -battery. Default is 0 +battery, and when no carrier is detected on the interface (e.g., no active cable is +plugged in). Default is 0 + +.SS "\fI/etc/laptop-mode/conf.d/cpuhotplug.conf\fP" + +The cpuhotplug module allows you to switch off the CPU cores when running on battery +.IP "\fBCONTROL_CPU_HOTPLUG\fP" 10 +When this option is enabled, Laptop Mode Tools can hotplug your CPU, thus switching +it offline, and conserving some power. +NOTE: This module is NOT enabled by default .SS "\fI/etc/laptop-mode/conf.d/cpufreq.conf\fP" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/usr/sbin/laptop_mode new/laptop-mode-tools_1.69.1/usr/sbin/laptop_mode --- old/laptop-mode-tools_1.68.1/usr/sbin/laptop_mode 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/usr/sbin/laptop_mode 2016-03-15 11:35:20.000000000 +0100 @@ -15,7 +15,7 @@ # # Maintainer: Ritesh Raj Sarraf ([email protected]) # Original Author: Bart Samwel ([email protected]) -# Project home page: http://samwel.tk/laptop_mode +# Project home page: http://github.com/rickysarraf/laptop-mode-tools # # Contributors to this script: Bart Samwel # Kiko Piris @@ -35,7 +35,7 @@ # The laptop mode tools version number. Extracted by the installer makefile # as well, so don't change the format! -LMTVERSION=1.68.1 +LMTVERSION=1.69.1 # This script is loaded from multiple scripts to set the config defaults # and to read the configuration on top of those. Only when the command is @@ -1115,6 +1115,9 @@ log "VERBOSE" "Module $SCRIPT is not executable or is to be skipped." fi done + + # Wait for the forks to complete + wait exit 0 @@ -1148,7 +1151,7 @@ log "VERBOSE" "On battery and there was no polling daemon yet, starting the polling daemon." # If there is no polling daemon, we start one. - /usr/share/laptop-mode-tools/module-helpers/lm-polling-daemon < /dev/null > /dev/null 2> /dev/null & + setsid /usr/share/laptop-mode-tools/module-helpers/lm-polling-daemon < /dev/null > /dev/null 2> /dev/null & fi else log "VERBOSE" "Lock acquisition on descriptor 7 failed with pid $$"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/cpuhotplug new/laptop-mode-tools_1.69.1/usr/share/laptop-mode-tools/modules/cpuhotplug --- old/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/cpuhotplug 1970-01-01 01:00:00.000000000 +0100 +++ new/laptop-mode-tools_1.69.1/usr/share/laptop-mode-tools/modules/cpuhotplug 2016-03-15 11:35:20.000000000 +0100 @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Laptop mode tools module to handle CPU Hot Plugging +# + + +if [ x$CONTROL_CPU_HOTPLUG = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_CPU_HOTPLUG = xauto ]; then + if [ $ON_AC -eq 1 ] ; then + if [ "$ACTIVATE" -eq 1 ] ; then + ECHO_VAL="$LM_AC_CPU_HOTPLUG" + else + ECHO_VAL="$NOLM_AC_CPU_HOTPLUG" + fi + else + ECHO_VAL="$BATT_CPU_HOTPLUG" + fi + + # To disable the CPU, write 0. So flip it here. + if [ x$ECHO_VAL = x1 ]; then + CPU_VAL=0; + else + CPU_VAL=1; + fi + + for THISCPU in /sys/devices/system/cpu/cpu[0-9]* ; do + if [ -e "$THISCPU/online" ]; then + log "VERBOSE" "Bringing CPU $THISCPU to $ECHO_VAL"; + echo $CPU_VAL > $THISCPU/online; + else + log "VERBOSE" "CPU $THISCPU cannot be hot plugged"; + fi + done +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/ethernet new/laptop-mode-tools_1.69.1/usr/share/laptop-mode-tools/modules/ethernet --- old/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/ethernet 2015-09-27 10:33:07.000000000 +0200 +++ new/laptop-mode-tools_1.69.1/usr/share/laptop-mode-tools/modules/ethernet 2016-03-15 11:35:20.000000000 +0100 @@ -32,6 +32,43 @@ fi + # Determine speed capability of physical device + speed=`$MIITOOL -v $DEVICE 2>/dev/null | grep capabilities | tr ' ' '\n' |\ + sort -n | sed -ne '/^1.*/p' | cut -d "b" -f1` + if [ -z "$speed" ]; then + speed=0; + fi + max_s=0; + min_s=100000; + for s in $speed; + do + if [ $s -gt $max_s ]; then + max_s=$s + fi + if [ $s -lt $min_s ]; then + min_s=$s + fi + done + MAX_SPEED=$max_s; + + case "$THROTTLE_SPEED" in + "slowest") + THROTTLE_SPEED=$min_s + ;; + "fastest") + THROTTLE_SPEED=$max_s + ;; + esac + + # Carrier detection + if $IPTOOL link show $DEVICE | grep -q NO-CARRIER; then + carrier="false"; + else + carrier="true"; + fi + + + # What state we are in if [ $ON_AC -eq 1 ]; then if [ "$ACTIVATE" -eq 1 ]; then THROTTLE_ETHERNET="$LM_AC_THROTTLE_ETHERNET" @@ -39,6 +76,12 @@ THROTTLE_ETHERNET="$NOLM_AC_THROTTLE_ETHERNET" fi + # One off a case. + # So that when back on AC, we can resume the speed back to MAX. + if [ x$THROTTLE_ETHERNET = x0 ]; then + THROTTLE_SPEED=$MAX_SPEED; + fi + if [ x$DISABLE_ETHERNET_ON_BATTERY = x1 ]; then # We are ON_AC and Disable feature is requested # So we might be required to re-enable the device. @@ -61,13 +104,6 @@ for DEVICE in $ETHERNET_DEVICES ; do log "VERBOSE" "ethernet: $DEVICE" - # Carrier detection - if $IPTOOL link show $DEVICE | grep -q NO-CARRIER; then - carrier="false"; - else - carrier="true"; - fi - # Wakeup-on-LAN handling if [ x$DISABLE_WAKEUP_ON_LAN = x1 ] ; then ret=`$ETHTOOL -s $DEVICE wol d 2>&1` @@ -80,34 +116,6 @@ fi fi - # Determine speed - speed=`$MIITOOL -v $DEVICE 2>/dev/null | grep capabilities | tr ' ' '\n' |\ - sort -n | sed -ne '/^1.*/p' | cut -d "b" -f1` - if [ -z "$speed" ]; then - speed=0; - fi - max_s=0; - min_s=100000; - for s in $speed; - do - if [ $s -gt $max_s ]; then - max_s=$s - fi - if [ $s -lt $min_s ]; then - min_s=$s - fi - done - MAX_SPEED=$max_s; - - case "$THROTTLE_SPEED" in - "slowest") - THROTTLE_SPEED=$min_s - ;; - "fastest") - THROTTLE_SPEED=$max_s - ;; - esac - # Handle throttling if [ x$THROTTLE_ETHERNET = x1 ] ; then # Handle Speed Throttling @@ -119,16 +127,6 @@ else log "VERBOSE" "Could not throttle speed for $DEVICE" fi - else - # Handle Speed Throttling - ret=`$ETHTOOL -s $DEVICE speed $MAX_SPEED 2>&1` - exit_status=$?; - log "VERBOSE" "$ret"; - if [ $exit_status -eq 0 ]; then - log "VERBOSE" "Restored speed to $MAX_SPEED Mbit for $DEVICE" - else - log "VERBOSE" "Could not restore speed for $DEVICE" - fi fi # Shut down interface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/laptop-mode-tools_1.68.1/usr/share/polkit-1/actions/org.linux.lmt.gui.policy new/laptop-mode-tools_1.69.1/usr/share/polkit-1/actions/org.linux.lmt.gui.policy --- old/laptop-mode-tools_1.68.1/usr/share/polkit-1/actions/org.linux.lmt.gui.policy 1970-01-01 01:00:00.000000000 +0100 +++ new/laptop-mode-tools_1.69.1/usr/share/polkit-1/actions/org.linux.lmt.gui.policy 2016-03-15 11:35:20.000000000 +0100 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd";> +<policyconfig> + + <action id="org.linux.lmt.gui.policy"> + <message>Authentication is required to run Laptop Mode Tools Config</message> + <icon_name>package-x-generic</icon_name> + <defaults> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/lmt-config-gui</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + +</policyconfig>
