[meego-commits] 7725: Changes to Trunk:Testing/sysvinit

[Auke Kok]

Hi,
I have made the following changes to sysvinit in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Auke Kok

[This message was auto-generated]

---

Request #7725:

  submit:   home:auke:branches:Trunk:Testing/sysvinit(r3)(cleanup) -> Trunk:Testing/sysvinit


Message:
    Re-submit after adding proper BMC# to changelog. Thanks.

State:   new          2010-09-23T09:39:31 auke
Comment: None



changes files:
--------------
--- sysvinit.changes
+++ sysvinit.changes
@@ -0,0 +1,3 @@
+* Tue Sep 21 2010 Auke Kok <auke-jan.h.kok at intel.com> - 2.86
+- BMC#7084: Reduce initctl select() timeout, power consumption change
+

new:
----
  sysvinit-2.86-long-timeo.patch

spec files:
-----------
--- sysvinit.spec
+++ sysvinit.spec
@@ -33,6 +33,7 @@
 Patch23: shutdown-splash.patch
 Patch24: sysvinit-2.86-halt-remove-sleep.patch
 Patch25: sysvinit-2.86-smaller-sleep-interval.patch
+Patch26: sysvinit-2.86-long-timeo.patch
 
 Source1: change_console
 Source2: change_console.8
@@ -60,7 +61,7 @@
 management.
 
 %package devel
-Summary: development files needed to programming init.
+Summary: Development files needed to programming init
 Group: Development/Libraries
 
 %description devel
@@ -118,6 +119,7 @@
 %patch23 -p1 -b .splash
 %patch24 -p1 -b .sleep
 %patch25 -p1 -b .smaller-time-interval
+%patch26 -p1 -b .longer-timeo
 
 %build
 make %{?_smp_mflags} CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -C src

other changes:
--------------

++++++ sysvinit-2.86-long-timeo.patch (new)
--- sysvinit-2.86-long-timeo.patch
+++ sysvinit-2.86-long-timeo.patch
+sysvinit: increase initctl timeout from 5 to 15 seconds.
+
+This timer adds 12 mostly unneeded wakeups from idle per minute, lower to 4.
+
+Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
+
+--- sysvinit-2.86/src/init.c.orig	2010-09-21 11:43:53.331669787 -0700
++++ sysvinit-2.86/src/init.c	2010-09-21 11:44:00.917669787 -0700
+@@ -2059,7 +2059,7 @@
+ 	/* Do select, return on EINTR. */
+ 	FD_ZERO(&fds);
+ 	FD_SET(pipe_fd, &fds);
+-	tv.tv_sec = 5;
++	tv.tv_sec = 15;
+ 	tv.tv_usec = 0;
+ 	n = select(pipe_fd + 1, &fds, NULL, NULL, &tv);
+ 	if (n <= 0) {