Merge lp:~jamesodhunt/ubuntu/lucid/procps/fix-for-bug-771372 into lp:ubuntu/lucid/procps

[James Hunt]

  * Make procps job run twice: as early as possible (for kernel
    parameters such as kernel.printk) and then after all network
    interfaces are up (to account for any kernel parameters relating
    to recently loaded networking modules) (LP: #771372).

Unmerged revisions

33. By James Hunt on 2011-12-07

Make procps job run twice: as early as possible (for kernel
parameters such as kernel.printk) and then after all network
interfaces are up (to account for any kernel parameters relating
to recently loaded networking modules) (LP: #771372).

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-16 11:06:56 +0000
+++ debian/changelog	2011-12-07 15:07:56 +0000
@@ -1,3 +1,12 @@
+procps (1:3.2.8-1ubuntu5) lucid; urgency=low
+
+  * Make procps job run twice: as early as possible (for kernel
+    parameters such as kernel.printk) and then after all network
+    interfaces are up (to account for any kernel parameters relating
+    to recently loaded networking modules) (LP: #771372).
+
+ -- James Hunt <[e-mail]>  Wed, 07 Dec 2011 14:53:24 +0000
+
 procps (1:3.2.8-1ubuntu4) lucid; urgency=low
 
   * debian/sysctl.d/10-zeropage.conf*: Reestablish a procps-controlled

=== modified file 'debian/upstart'
--- debian/upstart	2009-09-15 03:26:56 +0000
+++ debian/upstart	2011-12-07 15:07:56 +0000
@@ -5,7 +5,10 @@
 
 description	"set sysctls from /etc/sysctl.conf"
 
-start on virtual-filesystems
+instance $UPSTART_EVENTS
+env UPSTART_EVENTS=
+
+start on virtual-filesystems or stopped networking
 
 task
 script