Re: Fwd: Bug#647563: laptop-mode-tools: incompatible with linux 3.0 and later
On Sunday 05 February 2012 02:56 AM, Henrique de Moraes Holschuh wrote:
On Sun, 05 Feb 2012, Ritesh Raj Sarraf wrote:
> Please review the attached diff. This change will fix bug 647563.
Looks like /usr/share/laptop-mode-tools/modules/laptop-mode also need
fixing...
Yes. Thanks for catching that. Attached diff fixes it.
Please reivew and ack.
--
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
diff -Nru laptop-mode-tools-1.55/debian/changelog laptop-mode-tools-1.55/debian/changelog
--- laptop-mode-tools-1.55/debian/changelog 2010-06-05 13:55:34.000000000 +0530
+++ laptop-mode-tools-1.55/debian/changelog 2012-02-05 01:39:00.000000000 +0530
@@ -1,3 +1,9 @@
+laptop-mode-tools (1.55-2) stable-proposed-updates; urgency=low
+
+ * Fix compatiblity with 3.x kernels (Closes: #647563)
+
+ -- Ritesh Raj Sarraf <rrs@debian.org> Sun, 05 Feb 2012 01:37:56 +0530
+
laptop-mode-tools (1.55-1) unstable; urgency=low
* Change address to my official Debian address
diff -Nru laptop-mode-tools-1.55/debian/patches/fix-version-compatibility.patch laptop-mode-tools-1.55/debian/patches/fix-version-compatibility.patch
--- laptop-mode-tools-1.55/debian/patches/fix-version-compatibility.patch 1970-01-01 05:30:00.000000000 +0530
+++ laptop-mode-tools-1.55/debian/patches/fix-version-compatibility.patch 2012-02-05 12:24:02.000000000 +0530
@@ -0,0 +1,93 @@
+Fix version compatibility with 3.x kernels
+Closes: #647563
+Index: laptop-mode-tools-1.55/usr/sbin/laptop_mode
+===================================================================
+--- laptop-mode-tools-1.55.orig/usr/sbin/laptop_mode 2010-05-26 21:24:44.000000000 +0530
++++ laptop-mode-tools-1.55/usr/sbin/laptop_mode 2012-02-05 12:21:46.000000000 +0530
+@@ -493,15 +493,6 @@
+ }
+ )"
+
+-case "$KLEVEL" in
+- "2.4" ) ;;
+- "2.6" ) ;;
+- *)
+- log "ERR" "Unhandled kernel version: $KLEVEL ('uname -r' = '$(uname -r)')" >&2
+- exit 1
+- ;;
+-esac
+-
+ # Stop exporting everything -- what we do from here is private.
+ set +a
+
+Index: laptop-mode-tools-1.55/usr/share/laptop-mode-tools/modules/laptop-mode
+===================================================================
+--- laptop-mode-tools-1.55.orig/usr/share/laptop-mode-tools/modules/laptop-mode 2010-05-26 21:24:44.000000000 +0530
++++ laptop-mode-tools-1.55/usr/share/laptop-mode-tools/modules/laptop-mode 2012-02-05 12:23:53.008243713 +0530
+@@ -187,21 +187,18 @@
+ set_sysctl /proc/sys/fs/xfs/xfsbufd_centisecs 3000
+ fi
+
+- case "$KLEVEL" in
+- "2.4")
+- log "VERBOSE" "Adjusting 2.4 kernel parameters to enable laptop mode."
+- set_sysctl /proc/sys/vm/laptop_mode 1
+- set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $AGE $AGE 60 20 0"
+- ;;
+- "2.6")
+- log "VERBOSE" "Adjusting 2.6 kernel parameters to enable laptop mode."
+- set_sysctl /proc/sys/vm/laptop_mode "$LM_SECONDS_BEFORE_SYNC"
+- set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$AGE"
+- set_sysctl /proc/sys/vm/dirty_expire_centisecs "$AGE"
+- set_sysctl /proc/sys/vm/dirty_ratio "$LM_DIRTY_RATIO"
+- set_sysctl /proc/sys/vm/dirty_background_ratio "$LM_DIRTY_BACKGROUND_RATIO"
+- ;;
+- esac
++ if [ -f /proc/sys/vm/bdflush ]; then
++ log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
++ set_sysctl /proc/sys/vm/laptop_mode 1
++ set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
++ else
++ log "VERBOSE" "Adjusting 2.6+ kernel parameters to disable laptop mode."
++ set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$U_AGE"
++ set_sysctl /proc/sys/vm/dirty_expire_centisecs "$B_AGE"
++ set_sysctl /proc/sys/vm/dirty_ratio "$NOLM_DIRTY_RATIO"
++ set_sysctl /proc/sys/vm/dirty_background_ratio "$NOLM_DIRTY_BACKGROUND_RATIO"
++ fi
++
+ if [ $CONTROL_MOUNT_OPTIONS -eq 1 ]; then
+ log "VERBOSE" "Remounting filesystems."
+ # The -r flag makes 'read' preserve backslashes read from
+@@ -316,19 +313,19 @@
+ set_sysctl /proc/sys/fs/xfs/xfssyncd_centisecs $((100*$DEF_XFS_SYNC_INTERVAL))
+ set_sysctl /proc/sys/fs/xfs/xfsbufd_centisecs $((100*$DEF_XFS_BUFD_INTERVAL))
+ fi
+- case "$KLEVEL" in
+- "2.4")
+- log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
+- set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
+- ;;
+- "2.6")
+- log "VERBOSE" "Adjusting 2.6 kernel parameters to disable laptop mode."
+- set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$U_AGE"
+- set_sysctl /proc/sys/vm/dirty_expire_centisecs "$B_AGE"
+- set_sysctl /proc/sys/vm/dirty_ratio "$NOLM_DIRTY_RATIO"
+- set_sysctl /proc/sys/vm/dirty_background_ratio "$NOLM_DIRTY_BACKGROUND_RATIO"
+- ;;
+- esac
++
++ if [ -f /proc/sys/vm/bdflush ]; then
++ log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
++ set_sysctl /proc/sys/vm/laptop_mode 1
++ set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
++ else
++ log "VERBOSE" "Adjusting 2.6+ kernel parameters to disable laptop mode."
++ set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$U_AGE"
++ set_sysctl /proc/sys/vm/dirty_expire_centisecs "$B_AGE"
++ set_sysctl /proc/sys/vm/dirty_ratio "$NOLM_DIRTY_RATIO"
++ set_sysctl /proc/sys/vm/dirty_background_ratio "$NOLM_DIRTY_BACKGROUND_RATIO"
++ fi
++
+ if [ $CONTROL_MOUNT_OPTIONS -eq 1 ] ; then
+ log "VERBOSE" "Remounting filesystems."
+ # The -r flag makes 'read' preserve backslashes read from
diff -Nru laptop-mode-tools-1.55/debian/patches/series laptop-mode-tools-1.55/debian/patches/series
--- laptop-mode-tools-1.55/debian/patches/series 2010-06-05 13:55:35.000000000 +0530
+++ laptop-mode-tools-1.55/debian/patches/series 2012-02-05 01:37:28.000000000 +0530
@@ -1 +1,2 @@
debian-changes-1.55-1
+fix-version-compatibility.patch
Reply to: