On further testing, looks like we need to set pkisilent to use 1.7 too.
The attached patch does this.
Ade
On Fri, 2016-03-11 at 11:07 -0500, Ade Lee wrote:
> Thanks.
>
> Fix checked into rhel 6.8 branch ..
>
> Counting objects: 62, done.
> Compressing objects: 100% (31/31), done.
> Writing objects: 100% (32/32), 5.18 KiB, done.
> Total 32 (delta 18), reused 0 (delta 0)
> To ssh://git.app.eng.bos.redhat.com/srv/git/pki.git
> 3637b1f..dd5039f DOGTAG_9_0_RHEL_BRANCH -> DOGTAG_9_0_RHEL_BRANCH
>
> Matt, please create builds, attach to errata etc.
> Ade
>
> On Thu, 2016-03-10 at 22:41 -0700, Matthew Harmsen wrote:
> > On 03/10/2016 09:52 AM, Ade Lee wrote:
> > > Fix java_home and other 6.8 bugs
> > >
> > > Fixes:
> > > 1. BZ 1306989 - Crash seen with pki-common pkg during IPA
> > > server install
> > > Crash in upgrade script occurs because prior to
> > > configuration,
> > > CS.cfg has lines that are comments and that do not parse
> > > neatly
> > > into a foo=bar pattern. Now, we will ignore comments and
> > > blank lines.
> > >
> > > 2. BZ 1290535 - Check for incompatible Java at startup
> > > The bulk of this change. Sets the JAVA_HOME to the 1.7.0
> > > JRE.
> > > rather than relying on alternatives. Also includes
> > > migration script
> > > for existing instances.
> > >
> > > 3. BZ1313207 - ca.subsystem.certreq missing from CS.cfg
> > > certreq is not really needed right now for the upgrade
> > > scripts.
> > > This will ignore the error if it is not present.
> > >
> > > Please review,
> > >
> > > Ade
> > >
> > >
> > > _______________________________________________
> > > Pki-devel mailing list
> > > [email protected]
> > > https://www.redhat.com/mailman/listinfo/pki-devel
> > ACK
> >
> > CAVEAT: Since the KRA, OCSP, and TKS subsystems are not available
> > on the RHEL 6 platform, the following changes may be checked into
> > the DOGTAG_9_0_RHEL_BRANCH,
> > but will not be included in the 'pki-core' patch,
> > nor will any additional packages be created for pki-kra, pki-ocsp,
> > nor pki-tks:
> >
> > base/kra/setup/registry_instance
> > base/kra/shared/conf/tomcat6.conf
> > base/ocsp/setup/registry_instance
> > base/ocsp/shared/conf/tomcat6.conf
> > base/tks/setup/registry_instance
> > base/tks/shared/conf/tomcat6.conf
> >
> _______________________________________________
> Pki-devel mailing list
> [email protected]
> https://www.redhat.com/mailman/listinfo/pki-devel
From 933b69379427ed1b17b237ccb8521c325fb73fc4 Mon Sep 17 00:00:00 2001
From: Ade Lee <[email protected]>
Date: Mon, 14 Mar 2016 13:02:43 -0700
Subject: [PATCH] Set pkisilent to use Java 1.7
Part of BZ 1290535
---
base/silent/scripts/pkisilent | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/base/silent/scripts/pkisilent b/base/silent/scripts/pkisilent
index 21180d17fe70d2863ad99de79cf2e5d1d97e3c79..d584537e3631bee6d9d025d926cec124b0a89244 100755
--- a/base/silent/scripts/pkisilent
+++ b/base/silent/scripts/pkisilent
@@ -24,6 +24,7 @@
my $PRODUCT="pki";
my $libpath="";
+my $java_cmd="java";
###############################################################################
@@ -55,6 +56,7 @@ sub invalid_architecture()
my $OS=`uname -s`;
my $ARCHITECTURE="";
+
chop($OS);
@@ -69,6 +71,7 @@ if($OS eq "Linux")
$ENV{LD_LIBRARY_PATH} = "/usr/lib/osutil:"
. "/usr/lib/jss:"
. "/usr/lib/:/lib/:" ;
+ $java_cmd = '/usr/lib/jvm/jre-1.7.0-openjdk/bin/java';
}
elsif($ARCHITECTURE eq "x86_64")
@@ -81,6 +84,7 @@ if($OS eq "Linux")
. "/usr/lib/osutil:"
. "/usr/lib/jss:"
. "/usr/lib/:/lib/:" ;
+ $java_cmd = '/usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java';
}
else
{
@@ -166,7 +170,7 @@ my @args = ();
foreach (@ARGV) {
push(@args, quotemeta($_));
}
-my $output = `java -cp $ENV{CLASSPATH} @args`;
+my $output = `$java_cmd -cp $ENV{CLASSPATH} @args`;
my $status = $?;
print "#######################################################################\n";
--
1.7.1
_______________________________________________
Pki-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/pki-devel
