| 1 |
jpp |
1.1 |
diff -Nur --no-dereference e-smith-lib-2.6.0.old/root/usr/share/perl5/vendor_perl/esmith/util.pm e-smith-lib-2.6.0/root/usr/share/perl5/vendor_perl/esmith/util.pm |
| 2 |
|
|
--- e-smith-lib-2.6.0.old/root/usr/share/perl5/vendor_perl/esmith/util.pm 2021-10-28 00:06:25.915000000 -0400 |
| 3 |
|
|
+++ e-smith-lib-2.6.0/root/usr/share/perl5/vendor_perl/esmith/util.pm 2021-10-28 00:09:41.931000000 -0400 |
| 4 |
|
|
@@ -1123,15 +1123,17 @@ |
| 5 |
|
|
{ |
| 6 |
|
|
my ($startScript) = glob("/etc/rc.d/rc7.d/S*$serviceName") ||'' ; |
| 7 |
|
|
my ($systemdScript) = "/usr/lib/systemd/system/$serviceName.service" ||''; |
| 8 |
|
|
+ my $multiple = "$serviceName.service"; |
| 9 |
|
|
+ ($multiple = $serviceName ) =~ s/([a-zA-Z0-9\-_.]+@)(.*)/$1.service/ if ( $serviceName =~ /@/ ); |
| 10 |
|
|
|
| 11 |
|
|
- unless ( -e $startScript or -e $systemdScript) |
| 12 |
|
|
+ unless ( -e $startScript or -e $systemdScript or -e "/usr/lib/systemd/system/$multiple") |
| 13 |
|
|
{ |
| 14 |
|
|
warn "serviceControl: startScript not found " |
| 15 |
|
|
. "for service $serviceName\n"; |
| 16 |
|
|
return 0; |
| 17 |
|
|
} |
| 18 |
|
|
|
| 19 |
|
|
- if (-e $systemdScript and ! -e $startScript){ |
| 20 |
|
|
+ if ( (-e $systemdScript or -e "/usr/lib/systemd/system/$multiple") and ! -e $startScript){ |
| 21 |
|
|
# systemd is not aware of adjust, sigusr1, sigusr2, sigterm, sighup |
| 22 |
|
|
$serviceAction = ( $serviceAction =~/^(adjust|graceful|sighup|sigusr1|sigusr2)$/ ) ? "reload-or-restart" : $serviceAction; |
| 23 |
|
|
$serviceAction = ( $serviceAction eq "sigterm" ) ? "restart" : $serviceAction; |
Parent Directory
| 
Revision Log
| 
Revision Graph
