Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text needs

correction


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1034 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 14 insertions, 2 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index e665925b9..5b358005c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -187,12 +187,24 @@ public class DonePanel extends WizardPanelBase {
             select = cs.getString("preop.subsystem.select", "");
         } catch (Exception e) {}
 
+        String initDaemon = "";
+        if (type.equals("CA")) {
+			initDaemon = "pki-cad";
+        } else if (type.equals("KRA")) {
+			initDaemon = "pki-krad";
+        } else if (type.equals("OCSP")) {
+			initDaemon = "pki-ocspd";
+        } else if (type.equals("TKS")) {
+			initDaemon = "pki-tksd";
+        }
         String os = System.getProperty( "os.name" );
         if( os.equalsIgnoreCase( "Linux" ) ) {
-            context.put( "initCommand", "/sbin/service " + instanceId );
+            context.put( "initCommand", "/sbin/service " + initDaemon );
+            context.put( "instanceId", instanceId );
         } else {
             /* default case:  e. g. - ( os.equalsIgnoreCase( "SunOS" ) */
-            context.put( "initCommand", "/etc/init.d/" + instanceId );
+            context.put( "initCommand", "/etc/init.d/" + initDaemon );
+            context.put( "instanceId", instanceId );
         }
         context.put("title", "Done");
         context.put("panel", "admin/console/config/donepanel.vm");