summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-03-04 19:12:55 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-03-04 19:12:55 +0000
commit63593cbd20c7d21e5152203ecbbed8a0a1e914a5 (patch)
tree5687583d96aaa86bec5c65641ed01ac2553f5237
parent313894f93c7fc92142bee6009e23c5a94baf4543 (diff)
downloadpki-63593cbd20c7d21e5152203ecbbed8a0a1e914a5.tar.gz
pki-63593cbd20c7d21e5152203ecbbed8a0a1e914a5.tar.xz
pki-63593cbd20c7d21e5152203ecbbed8a0a1e914a5.zip
Bugzilla Bug #440344 - Installation page should tell admins to use "service",
not "/etc/init.d" on Linux. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@274 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat
-rwxr-xr-xpki/base/setup/pkiremove10
-rw-r--r--pki/dogtag/common-ui/dogtag-pki-common-ui.spec5
-rw-r--r--pki/dogtag/common/pki-common.spec5
-rw-r--r--pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec5
-rw-r--r--pki/dogtag/ra/pki-ra.spec5
-rw-r--r--pki/dogtag/setup/pki-setup.spec5
-rw-r--r--pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec5
-rw-r--r--pki/dogtag/tps/pki-tps.spec5
8 files changed, 37 insertions, 8 deletions
diff --git a/pki/base/setup/pkiremove b/pki/base/setup/pkiremove
index 3ba93ff48..c8cdddd9d 100755
--- a/pki/base/setup/pkiremove
+++ b/pki/base/setup/pkiremove
@@ -473,6 +473,7 @@ sub remove_instance()
. "/" . $saved_cleanup_file_name;
my @files;
my @directories;
+ my $pki_start_stop_command = "";
my $pki_start_stop_script_instance_file_path = "";
my $confirm = "Y";
@@ -553,7 +554,14 @@ ASK_AGAIN:
return $result;
}
- $command = "$pki_start_stop_script_instance_file_path stop";
+ if( $^O eq "linux" ) {
+ $pki_start_stop_command = "/sbin/service" . " " . $pki_instance_name;
+ } else {
+ # default case: e. g. - ( $^O eq "solaris" )
+ $pki_start_stop_command = $pki_start_stop_script_instance_file_path;
+ }
+
+ $command = "$pki_start_stop_command stop";
system( "$command" );
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index 93a819d56..7755e628c 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_ui_prefix}-%{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 10
+%define base_release 11
%define base_group System Environment/Base
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-10
- Bugzilla 224835 and 367171: Allow cert nicknames to be edited and sizepanel fixes
* Thu Feb 26 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-9
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 138eeaba8..a46081477 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 47
+%define base_release 48
%define base_group System Environment/Base
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -285,6 +285,9 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-48
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Tue Mar 3 2009 Ade Lee <alee@redhat.com> 1.0.0-47
- Bugzilla Bug #487739 - Unable to setup cloning
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-46
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 8d46a4a97..ebc29d85c 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_ui_prefix}-%{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 7
+%define base_release 8
%define base_group System Environment/Base
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-7
- Bugzilla 224835 and 367171: Allow cert nicknames to be edited and sizepanel fixes
* Thu Feb 26 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index a2ede55dd..bdff91d26 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 18
+%define base_release 19
%define base_group System Environment/Daemons
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -261,6 +261,9 @@ fi
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-19
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-18
- Bugzilla 224835 and 367171: Allow cert nicknames to be edited and sizepanel fixes
* Thu Feb 26 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-17
diff --git a/pki/dogtag/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec
index f966ef310..739b1f7c2 100644
--- a/pki/dogtag/setup/pki-setup.spec
+++ b/pki/dogtag/setup/pki-setup.spec
@@ -33,7 +33,7 @@
## Package Header Definitions
%define base_name %{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 12
+%define base_release 13
%define base_group System Environment/Shells
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -217,6 +217,9 @@ rm -rf ${RPM_BUILD_ROOT}
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-13
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Tue Feb 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-12
- Bugzilla Bug #485859 - port separation for RA and TPS
* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 7edca6248..b014d3edc 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_ui_prefix}-%{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 10
+%define base_release 11
%define base_group System Environment/Base
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-10
- Bugzilla 224835 and 367171: Allow cert nicknames to be edited and sizepanel fixes
* Thu Feb 26 2009 Ade Lee <alee@redhat.com> 1.0.0-9
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 3de7382ed..63e6f4d53 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -34,7 +34,7 @@
## Package Header Definitions
%define base_name %{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 29
+%define base_release 30
%define base_group System Environment/Daemons
%define base_vendor Red Hat, Inc.
%define base_license LGPLv2 with exceptions
@@ -308,6 +308,9 @@ fi
###############################################################################
%changelog
+* Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-30
+- Bugzilla Bug #440344 - Installation page should tell admins to use
+ "service", not "/etc/init.d" on Linux
* Fri Feb 27 2009 Jack Magne <jmagne@redhat.com> 1.0.0-29
- Bugzilla #485829 - Support for 2048 bit safenet keys.
* Fri Feb 27 2009 Ade Lee <alee@redhat.com> 1.0.0-28
generated by cgit (git 2.34.1) at 2024-11-12 20:04:51 +0000