[Pkg-sysvinit-commits] r1317 - in sysvinit/trunk/debian: . sysv-rc/sbin
kelmo-guest at alioth.debian.org
kelmo-guest at alioth.debian.org
Mon Feb 2 13:53:18 UTC 2009
Author: kelmo-guest
Date: 2009-02-02 13:53:18 +0000 (Mon, 02 Feb 2009)
New Revision: 1317
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
Modify debian/sysv-rc/sbin/update-rc.d so defaults and startstop
functions accept local arguments instead of using (and modifying)
the global script argument array.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-02-02 13:48:12 UTC (rev 1316)
+++ sysvinit/trunk/debian/changelog 2009-02-02 13:53:18 UTC (rev 1317)
@@ -26,8 +26,11 @@
flexibly (assign permissions with udev, and the like). Thanks Martin
Pitt. Closes: #483392, #422940, #360165, #471101
* Add Homepage field to debian/control.
+ * Modify debian/sysv-rc/sbin/update-rc.d so defaults and startstop
+ functions accept local arguments instead of using (and modifying)
+ the global script argument array.
- -- Kel Modderman <kel at otaku42.de> Mon, 02 Feb 2009 23:48:05 +1000
+ -- Kel Modderman <kel at otaku42.de> Mon, 02 Feb 2009 23:52:52 +1000
sysvinit (2.86.ds1-61) unstable; urgency=low
Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d 2009-02-02 13:48:12 UTC (rev 1316)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d 2009-02-02 13:53:18 UTC (rev 1317)
@@ -63,8 +63,8 @@
$_ = $ARGV[0];
if (/^remove$/) { &checklinks ("remove"); }
-elsif (/^defaults$/) { &defaults; &makelinks }
-elsif (/^(start|stop)$/) { &startstop; &makelinks; }
+elsif (/^defaults$/) { &defaults (@ARGV); &makelinks; }
+elsif (/^(start|stop)$/) { &startstop (@ARGV); &makelinks; }
else { &usage; }
exit (0);
@@ -159,11 +159,12 @@
# Process the arguments after the "defaults" keyword.
sub defaults {
+ my @argv = @_;
my ($start, $stop) = (20, 20);
- &usage ("defaults takes only one or two codenumbers") if ($#ARGV > 2);
- $start = $stop = $ARGV[1] if ($#ARGV >= 1);
- $stop = $ARGV[2] if ($#ARGV >= 2);
+ &usage ("defaults takes only one or two codenumbers") if ($#argv > 2);
+ $start = $stop = $argv[1] if ($#argv >= 1);
+ $stop = $argv[2] if ($#argv >= 2);
&usage ("codenumber must be a number between 0 and 99")
if ($start !~ /^\d\d?$/ || $stop !~ /^\d\d?$/);
@@ -179,23 +180,23 @@
# Process the arguments after the start or stop keyword.
sub startstop {
-
+ my @argv = @_;
my($letter, $NN, $level);
- while ($#ARGV >= 0) {
- if ($ARGV[0] eq 'start') { $letter = 'S'; }
- elsif ($ARGV[0] eq 'stop') { $letter = 'K' }
+ while ($#argv >= 0) {
+ if ($argv[0] eq 'start') { $letter = 'S'; }
+ elsif ($argv[0] eq 'stop') { $letter = 'K'; }
else {
&usage("expected start|stop");
}
- if ($ARGV[1] !~ /^\d\d?$/) {
- &usage("expected NN after $ARGV[0]");
+ if ($argv[1] !~ /^\d\d?$/) {
+ &usage("expected NN after $argv[0]");
}
- $NN = sprintf("%02d", $ARGV[1]);
+ $NN = sprintf("%02d", $argv[1]);
- shift @ARGV; shift @ARGV;
- $level = shift @ARGV;
+ shift @argv; shift @argv;
+ $level = shift @argv;
do {
if ($level !~ m/^[0-9S]$/) {
&usage(
@@ -209,7 +210,7 @@
$level = 99 if ($level eq 'S');
$startlinks[$level] = "$letter$NN" if ($letter eq 'S');
$stoplinks[$level] = "$letter$NN" if ($letter eq 'K');
- } while (($level = shift @ARGV) ne '.');
+ } while (($level = shift @argv) ne '.');
&usage("action with list of runlevels not terminated by \`.'")
if ($level ne '.');
}
More information about the Pkg-sysvinit-commits
mailing list