mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 14:13:29 +00:00
Fix to remove pointless alias sub-commands
This commit is contained in:
13
bin/server
13
bin/server
@@ -24,7 +24,7 @@ sub main
|
||||
# If username passed as regular param
|
||||
my $cmd = scalar(@ARGV) == 1 && $ARGV[0];
|
||||
$cmd = $opt{'command'} if ($opt{'command'});
|
||||
if ($cmd !~ /^(status|start|stop|restart|reload|force-restart|force-reload|kill)$/) {
|
||||
if ($cmd !~ /^(status|start|stop|restart|reload|force-restart|kill)$/) {
|
||||
$cmd = undef;
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ sub run
|
||||
my $rs = system("$o->{'config'}/$o->{'cmd'} $service");
|
||||
exit $rs;
|
||||
}
|
||||
if ($o->{'cmd'} =~ /^(kill|force-kill)$/) {
|
||||
if ($o->{'cmd'} =~ /^(kill)$/) {
|
||||
my $rs;
|
||||
if (-x $systemctlcmd) {
|
||||
$rs = system("$systemctlcmd stop $service");
|
||||
@@ -81,7 +81,7 @@ sub run
|
||||
$rs = system("$o->{'config'}/.stop-init --kill >/dev/null 2>&1 $service");
|
||||
exit $rs;
|
||||
}
|
||||
if ($o->{'cmd'} =~ /^(force-reload|force-restart)$/) {
|
||||
if ($o->{'cmd'} =~ /^(force-restart)$/) {
|
||||
my $rs = system("$o->{'config'}/restart-by-force-kill $service");
|
||||
exit $rs;
|
||||
}
|
||||
@@ -166,15 +166,10 @@ sub root
|
||||
- start
|
||||
- stop
|
||||
- restart
|
||||
- reload
|
||||
- force-restart
|
||||
- force-reload
|
||||
- reload
|
||||
- kill
|
||||
|
||||
Alias commands:
|
||||
- force-restart | force-reload
|
||||
- kill | force-kill
|
||||
|
||||
=back
|
||||
|
||||
=head1 LICENSE AND COPYRIGHT
|
||||
|
||||
Reference in New Issue
Block a user