From 5bf0a0a725d73523350c0882dc316802bd0c584a Mon Sep 17 00:00:00 2001 From: noriko Date: Wed, 27 Mar 2013 15:07:06 -0700 Subject: [PATCH] Ticket #47298 - remove-ds-admin.pl does not stop the admin server Bug description: Keyword to be replaced for the build had a typo in the stopAdminServer subroutine. Fix description: Replacing "@with_systemdsystemunitdir@" with "@systemdsystemunitdir@". --- admserv/newinst/src/AdminServer.pm.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admserv/newinst/src/AdminServer.pm.in b/admserv/newinst/src/AdminServer.pm.in index d769522..937df8a 100644 --- a/admserv/newinst/src/AdminServer.pm.in +++ b/admserv/newinst/src/AdminServer.pm.in @@ -605,10 +605,10 @@ sub reconfigAdminServer { sub stopAdminServer { my $prog = "@sbindir@/stop-ds-admin"; - if ("@with_systemdsystemunitdir@") { - $prog = "/bin/systemctl stop @package_name@.service"; - } elsif ("@enable_service@") { + if ("@enable_service@") { $prog = "service @package_name@ stop"; + } elsif ("@systemdsystemunitdir@") { + $prog = "/bin/systemctl stop @package_name@.service"; } elsif (! -x $prog) { debug(1, "stopping admin server: no such program $prog: cannot stop server\n"); return 0; -- 1.7.1