rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup-tomcat | 5 +++--
spacewalk/setup/share/tomcat.1 | 2 +-
spacewalk/setup/share/tomcat.4 | 4 ++--
spacewalk/setup/share/tomcat.5 | 2 --
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
6 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit dce4048acc5300c1de6f0fa221bb3c35585ebd4d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 24 14:34:51 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.11-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 54e5ebb..1a877cf 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.10-1 spacewalk/setup/
+2.1.11-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 5f84472..74c9491 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.10
+Version: 2.1.11
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jan 24 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1
+- add oracle library path directly to commandline
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1
- 1039877 - disable ehcache check for updates
commit 8473272a8730aca95c385148be181a50cd2e79e3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 24 13:42:44 2014 +0100
add oracle library path directly to commandline
on Fedora 20 environment variable are no more exported so they are not
inherited by subprocesses
diff --git a/spacewalk/setup/bin/spacewalk-setup-tomcat
b/spacewalk/setup/bin/spacewalk-setup-tomcat
index 47fbafd..d33a319 100755
--- a/spacewalk/setup/bin/spacewalk-setup-tomcat
+++ b/spacewalk/setup/bin/spacewalk-setup-tomcat
@@ -30,6 +30,7 @@ sub java_opts {
$ret = <F>;
close(F);
chomp($ret);
+ $ret .= ld_library_path();
$ret = qq{JAVA_OPTS="$ret"\n};
}
return $ret;
@@ -56,7 +57,8 @@ sub ld_library_path {
if (-r ORACLE_LDCONF) {
open F, '<', ORACLE_LDCONF
or die "Error reading [" + ORACLE_LDCONF + "]:
$!\n";
- $ret = "LD_LIBRARY_PATH=" . <F>;
+ $ret = " -Djava.library.path=" . <F>;
+ chomp($ret);
close(F);
}
return $ret;
@@ -65,7 +67,6 @@ sub ld_library_path {
sub setup_tomcat {
my %macros = (JAVA_OPTS => java_opts(),
LD_PRELOAD => ld_preload(),
- LD_LIBRARY_PATH => ld_library_path(),
);
my ($tomcatvol, $tomcatdir, $tomcatname);
diff --git a/spacewalk/setup/share/tomcat.1 b/spacewalk/setup/share/tomcat.1
index 65b994e..cab7fe0 100644
--- a/spacewalk/setup/share/tomcat.1
+++ b/spacewalk/setup/share/tomcat.1
@@ -1,2 +1,2 @@
-^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256
-XX:-UseConcMarkSweepGC"\n
+^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256
-XX:-UseConcMarkSweepGC( -Dnet.sf.ehcache.skipUpdateCheck=true)?(
-Djava.library.path=\S+)?"\n
@JAVA_OPTS@
diff --git a/spacewalk/setup/share/tomcat.4 b/spacewalk/setup/share/tomcat.4
index 6266385..8db871d 100644
--- a/spacewalk/setup/share/tomcat.4
+++ b/spacewalk/setup/share/tomcat.4
@@ -1,2 +1,2 @@
-^LD_LIBRARY_PATH=.+\n
-@LD_LIBRARY_PATH@
+^LD_PRELOAD=.+\n
+@LD_PRELOAD@
diff --git a/spacewalk/setup/share/tomcat.5 b/spacewalk/setup/share/tomcat.5
deleted file mode 100644
index 8db871d..0000000
--- a/spacewalk/setup/share/tomcat.5
+++ /dev/null
@@ -1,2 +0,0 @@
-^LD_PRELOAD=.+\n
-@LD_PRELOAD@
Show replies by date