[kernel] r16470 - in people/waldi/s390/s390-tools/debian: . kernel

[Bastian Blank]

Author: waldi
Date: Thu Oct 21 14:47:49 2010
New Revision: 16470

Log:
* debian/changelog: Update.
* debian/kernel/zz-zipl: Don't fail if zipl.conf is missing.

Modified:
   people/waldi/s390/s390-tools/debian/changelog
   people/waldi/s390/s390-tools/debian/kernel/zz-zipl

Modified: people/waldi/s390/s390-tools/debian/changelog
==============================================================================
--- people/waldi/s390/s390-tools/debian/changelog	Thu Oct 21 00:14:35 2010	(r16469)
+++ people/waldi/s390/s390-tools/debian/changelog	Thu Oct 21 14:47:49 2010	(r16470)
@@ -1,3 +1,9 @@
+s390-tools (1.8.3-3) UNRELEASED; urgency=low
+
+  * Don't fail hook if zipl.conf is missing. (closes: #600100)
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 21 Oct 2010 16:46:40 +0200
+
 s390-tools (1.8.3-2) unstable; urgency=low
 
   * Add hook for kernel installation. (closes: #590028)

Modified: people/waldi/s390/s390-tools/debian/kernel/zz-zipl
==============================================================================
--- people/waldi/s390/s390-tools/debian/kernel/zz-zipl	Thu Oct 21 00:14:35 2010	(r16469)
+++ people/waldi/s390/s390-tools/debian/kernel/zz-zipl	Thu Oct 21 14:47:49 2010	(r16470)
@@ -1,2 +1,7 @@
 #!/bin/sh
-exec zipl </dev/null >&2
+
+if [ -f /etc/zipl.conf ];then
+    zipl </dev/null >&2
+else
+    echo "WARNING, not invoking zipl: /etc/zipl.conf not found" >&2
+fi