* update-motd: don't fail the entire script, if renice/ionice fail,

    Bug #331921; ionice to 'idle' rather than 'best-effort'

diff --git a/debian/changelog b/debian/changelog
index 735634594f0650c91a88fb3c6e30eaf1b6003c0c..f0a388795aaa727273b0df9aae878fdbd0c3746d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-update-motd (1.11) unreleased; urgency=low
+update-motd (1.11) jaunty; urgency=low
 
-  * 
+  * update-motd: don't fail the entire script, if renice/ionice fail,
+    LP: #331921; ionice to 'idle' rather than 'best-effort'
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 05 Mar 2009 08:09:59 -0600
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 05 Mar 2009 10:51:26 -0600
 
 update-motd (1.10) jaunty; urgency=low
 

diff --git a/update-motd b/update-motd
index 47ad99fa83e0bfa894db94fa3f92c99c97c61d09..7a4219b0faf3bec46f8c66a6ed4505598302748e 100755 (executable)
--- a/update-motd
+++ b/update-motd
@@ -112,8 +112,9 @@ trap "rm -f $NEW 2>/dev/null || true" EXIT HUP INT QUIT TERM
 
 if [ "$FORCE" != "1" ]; then
        # Be *really* nice, if we're running in the background (not forced)
-       renice 10 $$ >/dev/null
-       ionice -c2 -n7 -p $$ >/dev/null
+       # But don't fail the script if we're not able to 'nice'
+       renice 10 $$ >/dev/null &2>1 || true
+       ionice -c3 -p $$ >/dev/null &2>1 || true
 fi
 
 # Start with the motd header