From 081c10cedc9f685c016f9079f58e5417f12f7b50 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 16 Sep 2020 12:38:42 +0100
Subject: Use supplied name for looking up service descriptions.

Better to add new descriptions for socket-activated services rather
than try to reuse existing ones.
---
 perl-install/services.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'perl-install/services.pm')

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 {
-- 
cgit v1.2.1