summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-09-16 12:38:42 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-09-16 12:38:42 +0100
commit081c10cedc9f685c016f9079f58e5417f12f7b50 (patch)
tree0d068721c845643c1240a37b8534b6bf3c8e142f
parentdcc6d04eeab99ad61baef35f5284f2152f12c817 (diff)
downloaddrakx-081c10cedc9f685c016f9079f58e5417f12f7b50.tar
drakx-081c10cedc9f685c016f9079f58e5417f12f7b50.tar.gz
drakx-081c10cedc9f685c016f9079f58e5417f12f7b50.tar.bz2
drakx-081c10cedc9f685c016f9079f58e5417f12f7b50.tar.xz
drakx-081c10cedc9f685c016f9079f58e5417f12f7b50.zip
Use supplied name for looking up service descriptions.
Better to add new descriptions for socket-activated services rather than try to reuse existing ones.
-rw-r--r--perl-install/services.pm7
1 files changed, 1 insertions, 6 deletions
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 512d6a6c3..87995fc24 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -19,11 +19,6 @@ sub _unit_name {
"$service.service";
}
-sub _base_name {
- my ($service) = @_;
- $service =~ s/\.(service|socket|timer)$//;
-}
-
#- The name used in the lists returned by services(). For backwards compatibility,
#- use just the base name for .service units.
sub _list_name {
@@ -143,7 +138,7 @@ xfs => N_("Starts the X Font Server."),
xinetd => N_("Starts other deamons on demand."),
);
my ($name) = @_;
- my $s = $services{_base_name($name)};
+ my $s = $services{$name};
if ($s) {
$s = translate($s);
} else {