[Initscripts-ng-commits] r222 - /trunk/www/soc2006-bootsystem/code/correct-init-order

[dvictoria-guest at users.alioth.debian.org]

Author: dvictoria-guest
Date: Tue Sep 26 07:05:17 2006
New Revision: 222

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=222
Log:
correct-boot-order script with checks updated

Modified:
    trunk/www/soc2006-bootsystem/code/correct-init-order

Modified: trunk/www/soc2006-bootsystem/code/correct-init-order
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/www/soc2006-bootsystem/code/correct-init-order?rev=222&op=diff
==============================================================================
--- trunk/www/soc2006-bootsystem/code/correct-init-order (original)
+++ trunk/www/soc2006-bootsystem/code/correct-init-order Tue Sep 26 07:05:17 2006
@@ -108,16 +108,18 @@
 		if ($scriptinfo{$scriptname}{'required'}) {
 	    		my @depends = split(/\s+/, $scriptinfo{$scriptname}{'required'});
 	    		for my $dep (@depends) {
+				print "Current script\@$scriptinfo{$scriptname}{'order_ist'} ; Required-start = $dep\@$scriptinfo{$dep}{'order_ist'}\n";
 				unless (exists $scriptinfo{$dep}{'order_ist'} and $scriptinfo{$dep}{'order_ist'} < $scriptinfo{$scriptname}{'order_ist'}) {
-				print "Incorrect order: $dep\@ $scriptinfo{$dep}{'order_ist'} > $scriptname\@$scriptinfo{$scriptname}{'order_ist'}\n";
+				print "Missing dependency or incorrect order: $dep\@ $scriptinfo{$dep}{'order_ist'} > $scriptname\@$scriptinfo{$scriptname}{'order_ist'}\n";
 					}
 		    		}
-			}
+			} else {print "Missing run-time dependency information (Required-Start LSB header)\n"};
 
 
 		if ($scriptinfo{$scriptname}{'should'}) {
 	    		my @shoulds = split(/\s+/, $scriptinfo{$scriptname}{'should'});
 	    		for my $sho (@shoulds) {
+				print "Current script\@$scriptinfo{$scriptname}{'order_ist'} ; should-start = $sho\@$scriptinfo{$sho}{'order_ist'}\n";
 				if (exists $scriptinfo{$sho}{'order_ist'}){
 					unless ($scriptinfo{$sho}{'order_ist'} < $scriptinfo{$scriptname}{'order_ist'}) {
 				print "Incorrect SHOULD order: $sho\@ $scriptinfo{$sho}{'order_ist'} > $scriptname\@$scriptinfo{$scriptname}{'order_ist'}\n";
@@ -130,14 +132,15 @@
 		if ($scriptinfo{$scriptname}{'default_rl'}) {
 	    		my @runlevels = split(/\s+/, $scriptinfo{$scriptname}{'default_rl'});
 	    		for my $run (@runlevels) {
-				if (exists $scriptinfo{$scriptname}{'default_rl'} and $scriptinfo{$scriptname}{'runlevel_ist'} == $scriptinfo{$scriptname}{'$run'}) {
-				$found_rl=1;
+				# print "Default run-levels = $run and Actual runlevel = $scriptinfo{$scriptname}{'runlevel_ist'}\n";
+				if ($scriptinfo{$scriptname}{'runlevel_ist'} eq $run) {
+					$found_rl=1;
 					}
 		    		}
 				if ($found_rl == 0) {
 					print "Wrong or undefined runlevel\n";
 					}
-			}
+			} else {print "Missing run-level information (Default-Start LSB header)\n"};
 
 
 		}