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

[Bastian Blank]

Author: waldi
Date: Wed Jan 27 16:20:45 2010
New Revision: 15038

Log:
* debian/changelog: Update.
* debian/patches/zipl-optional.patch: Document parameter in manpage.

Modified:
   people/waldi/s390/s390-tools/debian/changelog
   people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch

Modified: people/waldi/s390/s390-tools/debian/changelog
==============================================================================
--- people/waldi/s390/s390-tools/debian/changelog	Wed Jan 27 16:17:00 2010	(r15037)
+++ people/waldi/s390/s390-tools/debian/changelog	Wed Jan 27 16:20:45 2010	(r15038)
@@ -9,6 +9,7 @@
   [ Frans Pop ]
   * lstape, chccwdev: use bash as shell. Closes: #566675.
   * Update debian/copyright and add upstream web site in debian/control.
+  * Document 'optional' parameter in zipl.conf man page. Closes: #566642.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 27 Jan 2010 10:01:14 +0000
 

Modified: people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch	Wed Jan 27 16:17:00 2010	(r15037)
+++ people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch	Wed Jan 27 16:20:45 2010	(r15038)
@@ -179,3 +179,28 @@
  		break;
  	case section_ipl_tape:
  		/* Tape IPL job */
+--- a/zipl/man/zipl.conf.5
++++ b/zipl/man/zipl.conf.5
+@@ -389,6 +389,22 @@
+ .BR 'segment' .
+ .PP
+
++.B optional
++=
++.IR 0 / 1
++(configuration only)
++.IP
++.B Configuration section:
++.br
++If this option is set to 1 the configuration section will only be included in
++the boot menu if the referenced image file exists, and running
++.BR zipl
++will not fail if the image file is missing.
++
++The default value for
++.B 'optional'
++is 0.
++
+ .B parameters
+ =
+ .I kernel\-parameters