[Initscripts-ng-commits] r943 - /trunk/src/insserv/debian/update-rc.d-insserv
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Thu Jul 30 11:23:50 UTC 2009
Author: pere
Date: Thu Jul 30 11:23:50 2009
New Revision: 943
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=943
Log:
Undo whitespace changes.
Modified:
trunk/src/insserv/debian/update-rc.d-insserv
Modified: trunk/src/insserv/debian/update-rc.d-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-rc.d-insserv?rev=943&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (original)
+++ trunk/src/insserv/debian/update-rc.d-insserv Thu Jul 30 11:23:50 2009
@@ -34,12 +34,12 @@
# maintainer scripts output is almost always redirected to /dev/null
# thanks to dh_installinit, so this should not be too noisy.
if ($#ARGV >= 0) {
- info("\`$action @ARGV' overridden by LSB info of $scriptname");
+ info("\`$action @ARGV' overridden by LSB info of $scriptname");
}
if ( -f "/etc/init.d/$scriptname" ) {
- exec "insserv", @opts, $scriptname;
+ exec "insserv", @opts, $scriptname;
} else {
- error("initscript does not exist: /etc/init.d/$scriptname");
+ error("initscript does not exist: /etc/init.d/$scriptname");
}
} elsif ("disable" eq $action || "enable" eq $action) {
toggle($action, $scriptname, @ARGV);
@@ -84,17 +84,17 @@
open my $fh, '<', $script or error("unable to read $script");
while (<$fh>) {
chomp;
- if (m/^### BEGIN INIT INFO$/) {
- $lsb{'begin'}++;
- }
- elsif (m/^### END INIT INFO$/) {
- $lsb{'end'}++;
- last;
- }
- elsif ($lsb{'begin'} and not $lsb{'end'}) {
- if (m/^# Default-Start:\s*(\S?.*)$/) {
- @def_start_lvls = split(' ', $1);
- }
+ if (m/^### BEGIN INIT INFO$/) {
+ $lsb{'begin'}++;
+ }
+ elsif (m/^### END INIT INFO$/) {
+ $lsb{'end'}++;
+ last;
+ }
+ elsif ($lsb{'begin'} and not $lsb{'end'}) {
+ if (m/^# Default-Start:\s*(\S?.*)$/) {
+ @def_start_lvls = split(' ', $1);
+ }
}
}
close($fh);
@@ -105,65 +105,65 @@
sub toggle {
my ($act, $name) = (shift, shift);
my ($lsb_header, @runlevels, @symlinks);
-
+
# Prefer insserv override file if it exists.
if (-s "/etc/insserv/overrides/$name") {
- $lsb_header = "/etc/insserv/overrides/$name";
+ $lsb_header = "/etc/insserv/overrides/$name";
} elsif (-s "/etc/init.d/$name") {
- $lsb_header = "/etc/init.d/$name";
+ $lsb_header = "/etc/init.d/$name";
} elsif (-s "/usr/share/insserv/overrides/$name") {
- # These overrides take effect only when no LSB info is
- # in /etc/init.d/$name
- $lsb_header = "/usr/share/insserv/overrides/$name";
+ # These overrides take effect only when no LSB info is
+ # in /etc/init.d/$name
+ $lsb_header = "/usr/share/insserv/overrides/$name";
} else {
- error("cannot find an initscript for $name");
+ error("cannot find an initscript for $name");
}
# Extra arguments to disable|enable action are runlevels. If none
# given parse LSB info for Default-Start value.
if ($#_ >= 0) {
- @runlevels = @_;
+ @runlevels = @_;
} else {
- @runlevels = parse_def_start($lsb_header);
- if ($#runlevels < 0) {
- error("$name Default-Start contains no runlevels, aborting.");
- }
+ @runlevels = parse_def_start($lsb_header);
+ if ($#runlevels < 0) {
+ error("$name Default-Start contains no runlevels, aborting.");
+ }
}
# Find symlinks in rc.d directories. Refuse to modify links in runlevels
# not used for normal system start sequence.
for my $lvl (@runlevels) {
- if ($lvl !~ /^[S2345]$/) {
- warning("$act action will have no effect on runlevel $lvl");
- next;
- }
- push(@symlinks, $_) for glob("/etc/rc$lvl.d/[SK][0-9][0-9]$name");
+ if ($lvl !~ /^[S2345]$/) {
+ warning("$act action will have no effect on runlevel $lvl");
+ next;
+ }
+ push(@symlinks, $_) for glob("/etc/rc$lvl.d/[SK][0-9][0-9]$name");
}
if (!@symlinks) {
- error("no runlevel symlinks to modify, aborting!");
+ error("no runlevel symlinks to modify, aborting!");
}
# Toggle S/K bit of script symlink.
for my $cur_lnk (@symlinks) {
- my $sk;
- my @new_lnk = split(//, $cur_lnk);
+ my $sk;
+ my @new_lnk = split(//, $cur_lnk);
- if ("disable" eq $act) {
- $sk = rindex($cur_lnk, '/S') + 1;
- next if $sk < 1;
- $new_lnk[$sk] = 'K';
- } else {
- $sk = rindex($cur_lnk, '/K') + 1;
- next if $sk < 1;
- $new_lnk[$sk] = 'S';
- }
+ if ("disable" eq $act) {
+ $sk = rindex($cur_lnk, '/S') + 1;
+ next if $sk < 1;
+ $new_lnk[$sk] = 'K';
+ } else {
+ $sk = rindex($cur_lnk, '/K') + 1;
+ next if $sk < 1;
+ $new_lnk[$sk] = 'S';
+ }
if ($notreally) {
- printf("rename(%s, %s)\n", $cur_lnk, join('', @new_lnk));
- next;
- }
+ printf("rename(%s, %s)\n", $cur_lnk, join('', @new_lnk));
+ next;
+ }
- rename($cur_lnk, join('', @new_lnk)) or error($!);
+ rename($cur_lnk, join('', @new_lnk)) or error($!);
}
}
More information about the Initscripts-ng-commits
mailing list