[Initscripts-ng-commits] r104 - in /trunk/www/soc2006-bootsystem:
bootcharts.html code/checkLSB
code/lintian_init.d code/lintian_init.d.desc resources.html
dvictoria-guest at users.alioth.debian.org
dvictoria-guest at users.alioth.debian.org
Sat Jul 29 13:06:03 UTC 2006
Author: dvictoria-guest
Date: Sat Jul 29 13:06:02 2006
New Revision: 104
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=104
Log:
lintian patch
Modified:
trunk/www/soc2006-bootsystem/bootcharts.html
trunk/www/soc2006-bootsystem/code/checkLSB
trunk/www/soc2006-bootsystem/code/lintian_init.d
trunk/www/soc2006-bootsystem/code/lintian_init.d.desc
trunk/www/soc2006-bootsystem/resources.html
Modified: trunk/www/soc2006-bootsystem/bootcharts.html
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/bootcharts.html?rev=104&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/bootcharts.html (original)
+++ trunk/www/soc2006-bootsystem/bootcharts.html Sat Jul 29 13:06:02 2006
@@ -55,7 +55,7 @@
<a name=parallel><b>Parallel execution</b></a> The boot time difference between parallel execution using CONCURRENCY=startpar and CONCURRENCY=shell in /etc/default/rcS was tested. CONCURRENCY=startpar shows no improvement from a modified script order with <a href=#insserv>insserv</a> while there is a further 2 second improvement with CONCURRENCY=shell. Thus, the total time improvement with parallel execution and reordering was of <b>4 seconds</b>. The reason for this behaviour may be due to a bug found in startpar. See the <a href=bootchart_sidKtip_parallel-shell.png>bootchart using shell</a><a href=bootchart_sidKtip_parallel-shell.tgz>(tgz)</a> and <a href=bootchart_sidKtip_parallel-startpar.png>using startpar</a><a href=bootchart_sidKtip_parallel-startpar.tgz>(tgz)</a>.The boot of the reference system requires 53 seconds <a href=bootchart_sidKtip_060720.png>(png)</a><a href=bootchart_sidKtip_060720.tgz>(tgz)</a>.
</p>
<p>
-<a name=preloading><b>Preloading</b></a> The Preload program from Behdad Esfahbod (a result from SoC2005) was tried again and after two reboots it showed a <b> 2 second </b> time improvement. mapprefix and exeprefix were set to empty such that all files would be accepted. The results were compared with mapprefix being <a href=log/dirpreload> set to the directories </a> used by some of the init scripts (strace -f initscript), adjusting the quantum time of preload (cycle parameter) and changing the position of the initscript to start just after hwclockfirst.sh. The results were the same: a <b> 2 second</b> time improvent. See the <a href=bootchart_sidKtip_preload.png>bootchart of preload accepting all files</a><a href=bootchart_sidKtip_preload.tgz>(tgz)</a>.and <a href=bootchart_sidKtip_preload2.png>with a selected set of directories from mapprefix</a><a href=bootchart_sidKtip_preload2.tgz>(tgz)</a>. The boot of the reference system requires 53 seconds <a href=bootchart_sidKtip_060720.png>(png)</a><a href=bootchart_sidKtip_060720.tgz>(tgz)</a>.
+<a name=preloading><b>Preloading</b></a> The Preload program from Behdad Esfahbod (a result from SoC2005) was tried again and after two reboots it showed a <b> 2 second </b> time improvement. mapprefix and exeprefix were set to empty such that all files would be accepted. The results were compared with mapprefix being <a href=log/dirpreload> set to the directories </a> used by some of the init scripts (strace -f initscript), adjusting the quantum time of preload (cycle parameter) and changing the position of the initscript to start just after hwclockfirst.sh. The results were the same: a <b> 2 second</b> time improvent. See the <a href=bootchart_sidKtip_preload.png>bootchart of preload accepting all files</a><a href=bootchart_sidKtip_preload.tgz>(tgz)</a>and <a href=bootchart_sidKtip_preload2.png>the bootchart with a selected set of directories from mapprefix</a><a href=bootchart_sidKtip_preload2.tgz>(tgz)</a>. The boot of the reference system requires 53 seconds <a href=bootchart_sidKtip_060720.png>(png)</a><a href=bootchart_sidKtip_060720.tgz>(tgz)</a>.
</p>
Modified: trunk/www/soc2006-bootsystem/code/checkLSB
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/code/checkLSB?rev=104&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/code/checkLSB (original)
+++ trunk/www/soc2006-bootsystem/code/checkLSB Sat Jul 29 13:06:02 2006
@@ -22,7 +22,7 @@
# Author: Petter Reinholdtsen
# Author: Carlos Villegas
# Created: 2006-06-26
-# Last updated: 2006-07-08
+# Last updated: 2006-07-29
#
# check-initd-order from Petter Reinholdtsen used as template.
#
@@ -165,12 +165,10 @@
print "Should-Stop=$shouldstop\n" if (defined $shouldstop && $debug);
print "Short-Description=$shortdescription\n" if (defined $shortdescription && $debug);
print "Description=$description\n\n" if (defined $description && $debug);
-
- if ($defaultstart =~ /[06]/){
- if ($provides && $requiredstart && $ending) {
- print "LSB Compliance in $initdir/$script.\n\n";
- } }
- elsif ($provides && $requiredstart && $requiredstop && $defaultstart && ($defaultstop || $defaultstop eq 0) && $ending) {
+
+
+
+ if ((($defaultstart =~ /[06]/) && ($provides && $requiredstart && $ending)) || ($provides && $requiredstart && $requiredstop && $defaultstart && ($defaultstop || $defaultstop eq 0) && $ending)) {
print "LSB Compliance in $initdir/$script.\n\n";
} else {
print "Missing LSB headers in $initdir/$script.\n \n";
Modified: trunk/www/soc2006-bootsystem/code/lintian_init.d
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/code/lintian_init.d?rev=104&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/code/lintian_init.d (original)
+++ trunk/www/soc2006-bootsystem/code/lintian_init.d Sat Jul 29 13:06:02 2006
@@ -139,11 +139,15 @@
# check if file exists in package
my $initd_file = "init.d/$_";
+
+ my $defaultstart;
+
if (-f $initd_file) {
# yes! check it...
open(IN,$initd_file) or fail("cannot open init.d file $initd_file: $!");
my %tag;
while (defined(my $l = <IN>)) {
+
#starts patch
if ($l =~ m/^\#\#\# BEGIN INIT INFO/){
$tag{'lsb-begin'} = 1
@@ -151,7 +155,7 @@
if ($l =~ m/^\#\#\# END INIT INFO/){
$tag{'lsb-ending'} = 1;
}
- if ($l =~ m/^\# provides:\s+\S*.*\S+\s*$/i);
+ if ($l =~ m/^\# provides:\s+\S*.*\S+\s*$/i){
$tag{'lsb-provides'} = 1;
}
if ($l =~ m/^\# required-start:/i){
@@ -163,12 +167,13 @@
if ($l =~ m/^\# should-start:\s+\S*.*\S+\s*$/i){
$tag{'lsb-shouldstart'} = 1;
}
- if ($l =~ m/^\# should-stop:\s+\S*.*\S+\s*$/i);
+ if ($l =~ m/^\# should-stop:\s+\S*.*\S+\s*$/i){
$tag{'lsb-shouldstop'} = 1;
}
if ($l =~ m/^\# default-start:/i){
$tag{'lsb-defaultstart'} = 1;
+ $defaultstart=$1 if ($l =~ m/^\# default-start:\s+(\S*.*\S+)\s*$/i);
}
if ($l =~ m/^\# default-stop:/i){
@@ -179,7 +184,7 @@
$tag{'lsb-shortdescription'} = 1;
}
- if ($l =~ m/^\# description:\s+\S*.*\S+\s*$/i);
+ if ($l =~ m/^\# description:\s+\S*.*\S+\s*$/i){
$tag{'lsb-description'} = 1;
}
#end patch
@@ -190,25 +195,34 @@
}
close(IN);
+ if ($tag{'lsb-begin'}){
+ if ((($defaultstart =~ /[06]/) && ($tag{'lsb-provides'} && $tag{'lsb-requiredstart'} && $tag{'lsb-ending'})) || ($tag{'lsb-provides'} && $tag{'lsb-requiredstart'} && $tag{'lsb-requiredstop'} && $tag{'lsb-defaultstart'} && $tag{'lsb-defaultstop'} && $tag{'lsb-ending'})) {
+ tag "init.d-script-has-complete-lsb-runtime-information","/etc/init.d/$_";
+ } else {
+ tag "init.d-script-has-incomplete-lsb-runtime-information","/etc/init.d/$_";
+ }
+
+
+ $tag{'lsb-begin'} or tag "init.d-script-does-not-implement-lsb-begin-header", "/etc/init.d/$_";
+ $tag{'lsb-provides'} or tag "init.d-script-does-not-implement-lsb-provides-header", "/etc/init.d/$_";
+ $tag{'lsb-requiredstart'} or tag "init.d-script-does-not-implement-lsb-requiredstart-header", "/etc/init.d/$_";
+ $tag{'lsb-requiredstop'} or tag "init.d-script-does-not-implement-lsb-requiredstop-header", "/etc/init.d/$_";
+ $tag{'lsb-shouldstart'} or tag "init.d-script-does-not-implement-lsb-shouldstart-header", "/etc/init.d/$_";
+ $tag{'lsb-shouldstop'} or tag "init.d-script-does-not-implement-lsb-shouldstop-header", "/etc/init.d/$_";
+ $tag{'lsb-defaultstart'} or tag "init.d-script-does-not-implement-lsb-defaultstart-header", "/etc/init.d/$_";
+ $tag{'lsb-defaultstop'} or tag "init.d-script-does-not-implement-lsb-defaultstop-header", "/etc/init.d/$_";
+ $tag{'lsb-shortdescription'} or tag "init.d-script-does-not-implement-lsb-shortdescription-header", "/etc/init.d/$_";
+ $tag{'lsb-description'} or tag "init.d-script-does-not-implement-lsb-description-header", "/etc/init.d/$_";
+ $tag{'lsb-ending'} or tag "init.d-script-does-not-implement-lsb-ending-header", "/etc/init.d/$_";
+
+ } else {
+ tag "init.d-script-has-no-lsb-runtime-information","/etc/init.d/$_";
+ }
# all tags included in file?
$tag{'start'} or tag "init.d-script-does-not-implement-required-option", "/etc/init.d/$_ start";
$tag{'stop'} or tag "init.d-script-does-not-implement-required-option", "/etc/init.d/$_ stop";
$tag{'restart'} or tag "init.d-script-does-not-implement-required-option", "/etc/init.d/$_ restart";
$tag{'force-reload'} or tag "init.d-script-does-not-implement-required-option", "/etc/init.d/$_ force-reload";
-
- #begin patch
- $tag{'lsb-begin'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-ending'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-provides'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-requiredstart'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-requiredstop'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-shouldstart'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-shouldstop'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-defaultstart'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-defaultstop'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-shortdescription'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- $tag{'lsb-description'} or tag "init.d-script-does-not-implement-lsb-begin-header", "";
- #end patch
} else {
tag "init.d-script-not-included-in-package", "/etc/init.d/$_";
Modified: trunk/www/soc2006-bootsystem/code/lintian_init.d.desc
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/code/lintian_init.d.desc?rev=104&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/code/lintian_init.d.desc (original)
+++ trunk/www/soc2006-bootsystem/code/lintian_init.d.desc Sat Jul 29 13:06:02 2006
@@ -75,25 +75,59 @@
unless you omit the links intentionally for some reason or create the
links some other way.
- #start patch
Tag: init.d-script-does-not-implement-lsb-begin-header
Type: warning
-Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: ### BEGIN INIT INFO. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt>### BEGIN INIT INFO</tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
Tag: init.d-script-does-not-implement-lsb-ending-header
Type: warning
-Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: ### END INIT INFO. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt>### END INIT INFO</tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
Tag: init.d-script-does-not-implement-lsb-provides-header
Type: warning
-Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: # Provides: . LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Provides: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
Tag: init.d-script-does-not-implement-lsb-requiredstart-header
Type: warning
-Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: ### BEGIN INIT INFO. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Required-Start: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
Tag: init.d-script-does-not-implement-lsb-requiredstop-header
Type: warning
-Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: ### BEGIN INIT INFO. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Required-Stop: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
- #end patch
+Tag: init.d-script-does-not-implement-lsb-shouldstart-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Should-Start: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-does-not-implement-lsb-shouldstop-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Should-Stop</tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-does-not-implement-lsb-defaultstart-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Default-Start: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-does-not-implement-lsb-defaultstop-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Default-Stop: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-does-not-implement-lsb-shortdescription-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Short-Description: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-does-not-implement-lsb-description-header
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has not a correct LSB header: <tt># Description: </tt>. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-has-complete-lsb-runtime-information
+Type: info
+Info: The <tt>/etc/init.d</tt> script has complete LSB runtime information. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-has-incomplete-lsb-runtime-information
+Type: warning
+Info: The <tt>/etc/init.d</tt> script has incomplete LSB runtime information. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
+Tag: init.d-script-has-no-lsb-runtime-information
+Type: error
+Info: The <tt>/etc/init.d</tt> script has no LSB headers with runtime information. LSB headers provide run-time dependencies that are used to check the correct boot order and to allow parallel execution during boot.
+
Modified: trunk/www/soc2006-bootsystem/resources.html
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/resources.html?rev=104&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/resources.html (original)
+++ trunk/www/soc2006-bootsystem/resources.html Sat Jul 29 13:06:02 2006
@@ -46,6 +46,7 @@
<p>
<a href=code/checkLSB>Script to check LSB compliance.</a>
<p>
+ Patch for lintian to check LSB compliance: <a href=code/lintian_init.d>lintian/checks/init.d</a> and <a href=code/lintian_init.d.desc>lintian/checks/init.d.desc</a>.
<h3>LSB compliance</h3>
More information about the Initscripts-ng-commits
mailing list