summaryrefslogtreecommitdiffstats
path: root/base/console
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2014-01-03 11:41:02 -0500
committerAde Lee <alee@redhat.com>2014-01-08 17:35:00 -0500
commitcc831a6be57a868cd36d15335eb0f65e77779c55 (patch)
tree623327b4a933ad8fe004dc59fc678e12a8001e95 /base/console
parent68819722a5d08e6e6eea29846e879cc7ab65eb44 (diff)
downloadpki-cc831a6be57a868cd36d15335eb0f65e77779c55.tar.gz
pki-cc831a6be57a868cd36d15335eb0f65e77779c55.tar.xz
pki-cc831a6be57a868cd36d15335eb0f65e77779c55.zip
Debian - replace arch specification
uname -i returns "unknown" on a debian system. "arch" on the other hand works for fedora, rhel and debian. Replacing these for all packages except for the migration ones which will not be built on debian in any case.
Diffstat (limited to 'base/console')
-rwxr-xr-xbase/console/templates/pki_console_wrapper4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/console/templates/pki_console_wrapper b/base/console/templates/pki_console_wrapper
index cc9590697..31c4ea481 100755
--- a/base/console/templates/pki_console_wrapper
+++ b/base/console/templates/pki_console_wrapper
@@ -81,11 +81,11 @@ OS=`uname -s`
ARCHITECTURE=""
if [ "${OS}" = "Linux" ] ; then
- ARCHITECTURE=`uname -i`
+ ARCHITECTURE=`arch`
JAVA="java"
JAVA_OPTIONS=""
- if [ "${ARCHITECTURE}" = "i386" ] ; then
+ if [ "${ARCHITECTURE}" = "i686" ] ; then
LD_LIBRARY_PATH=/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH