diff options
-rwxr-xr-x | base/console/templates/pki_console_wrapper | 4 | ||||
-rwxr-xr-x | base/java-tools/pki | 4 | ||||
-rw-r--r-- | base/java-tools/templates/pki_java_command_wrapper.in | 4 | ||||
-rw-r--r-- | base/java-tools/templates/pretty_print_cert_command_wrapper.in | 4 | ||||
-rw-r--r-- | base/java-tools/templates/pretty_print_crl_command_wrapper.in | 4 | ||||
-rwxr-xr-x | base/ra/scripts/nss_pcache | 4 | ||||
-rw-r--r-- | base/server/scripts/operations | 2 | ||||
-rwxr-xr-x | base/setup/pkicommon.pm | 4 | ||||
-rwxr-xr-x | base/setup/pkicreate | 2 | ||||
-rw-r--r-- | base/setup/scripts/functions | 2 | ||||
-rwxr-xr-x | base/setup/scripts/pki_apache_initscript | 2 | ||||
-rwxr-xr-x | base/silent/scripts/pkisilent | 4 | ||||
-rw-r--r-- | base/tps/apache/pki_instance_command_wrapper | 4 | ||||
-rw-r--r-- | base/tps/apache/pki_subsystem_command_wrapper | 4 | ||||
-rwxr-xr-x | base/tps/scripts/nss_pcache | 4 |
15 files changed, 26 insertions, 26 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 diff --git a/base/java-tools/pki b/base/java-tools/pki index 582162010..27802410f 100755 --- a/base/java-tools/pki +++ b/base/java-tools/pki @@ -45,10 +45,10 @@ sub invalid_architecture() ## search order this command uses to find shared libraries. ## ############################################################################### -my $ARCHITECTURE=`uname -i`; +my $ARCHITECTURE=`arch`; chop( $ARCHITECTURE ); -if( $ARCHITECTURE eq "i386" ) { +if( $ARCHITECTURE eq "i686" ) { $libpath="/usr/lib"; $ENV{LD_LIBRARY_PATH} = "/usr/lib/jss:" diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index e9ff00553..267b9df2c 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` 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 diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in index 811935ef4..06fac424d 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` 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 diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in index e70b9ab34..8aeec252c 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` 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 diff --git a/base/ra/scripts/nss_pcache b/base/ra/scripts/nss_pcache index bf978b48b..c1f6b6c31 100755 --- a/base/ra/scripts/nss_pcache +++ b/base/ra/scripts/nss_pcache @@ -33,8 +33,8 @@ fi OS=`uname -s` if [ $OS = "Linux" ]; then - PLATFORM=`uname -i` - if [ $PLATFORM = "i386" ]; then + PLATFORM=`arch` + if [ $PLATFORM = "i686" ]; then # 32-bit Linux LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH elif [ $PLATFORM = "x86_64" ]; then diff --git a/base/server/scripts/operations b/base/server/scripts/operations index 7d026fe31..ebbe5d084 100644 --- a/base/server/scripts/operations +++ b/base/server/scripts/operations @@ -56,7 +56,7 @@ esac shopt -s nullglob OS=`uname -s` -ARCHITECTURE=`uname -i` +ARCHITECTURE=`arch` # Check to insure that this script's original invocation directory # has not been deleted! diff --git a/base/setup/pkicommon.pm b/base/setup/pkicommon.pm index 16f553e00..b5bb8110e 100755 --- a/base/setup/pkicommon.pm +++ b/base/setup/pkicommon.pm @@ -207,10 +207,10 @@ if ($^O eq "linux") { $pki_registry_path = "$default_registry_path/pki"; $default_initscripts_path = "/etc/rc.d/init.d"; $default_lockdir = "/var/lock/pki"; - $default_hardware_platform = `uname -i`; + $default_hardware_platform = `arch`; $default_hardware_platform =~ s/\s+$//g; chomp($default_hardware_platform); - if ($default_hardware_platform eq "i386") { + if ($default_hardware_platform eq "i686") { # 32-bit Linux $default_system_binaries = "/bin"; $default_system_libraries = "/lib"; diff --git a/base/setup/pkicreate b/base/setup/pkicreate index a63d6b32c..097b881a6 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -629,7 +629,7 @@ if ($^O eq "linux") { # Initialize Java-specific variables if ($^O eq "linux") { - if ($default_hardware_platform eq "i386") { + if ($default_hardware_platform eq "i686") { # 32-bit Linux # Supported hardware token PKCS #11 modules diff --git a/base/setup/scripts/functions b/base/setup/scripts/functions index 45e6dee12..96722a1ee 100644 --- a/base/setup/scripts/functions +++ b/base/setup/scripts/functions @@ -62,7 +62,7 @@ esac shopt -s nullglob OS=`uname -s` -ARCHITECTURE=`uname -i` +ARCHITECTURE=`arch` # Check to insure that this script's original invocation directory # has not been deleted! diff --git a/base/setup/scripts/pki_apache_initscript b/base/setup/scripts/pki_apache_initscript index 247acad06..9fde99567 100755 --- a/base/setup/scripts/pki_apache_initscript +++ b/base/setup/scripts/pki_apache_initscript @@ -12,7 +12,7 @@ PKI_REGISTRY_FILE=[PKI_REGISTRY_FILE] shopt -s nullglob OS=`uname -s` -ARCHITECTURE=`uname -i` +ARCHITECTURE=`arch` # Source values associated with this particular PKI instance if [ -f $PKI_REGISTRY_FILE ]; then diff --git a/base/silent/scripts/pkisilent b/base/silent/scripts/pkisilent index e9b154437..d0189031a 100755 --- a/base/silent/scripts/pkisilent +++ b/base/silent/scripts/pkisilent @@ -45,10 +45,10 @@ sub invalid_architecture() ## search order this command uses to find shared libraries. ## ############################################################################### -my $ARCHITECTURE=`uname -i`; +my $ARCHITECTURE=`arch`; chop( $ARCHITECTURE ); -if( $ARCHITECTURE eq "i386" ) { +if( $ARCHITECTURE eq "i686" ) { $libpath="/usr/lib"; $ENV{LD_LIBRARY_PATH} = "/usr/lib/jss:" diff --git a/base/tps/apache/pki_instance_command_wrapper b/base/tps/apache/pki_instance_command_wrapper index 913b37e4a..8ecef8075 100644 --- a/base/tps/apache/pki_instance_command_wrapper +++ b/base/tps/apache/pki_instance_command_wrapper @@ -79,8 +79,8 @@ OS=`uname -s` ARCHITECTURE="" if [ "${OS}" = "Linux" ] ; then - ARCHITECTURE=`uname -i` - if [ "${ARCHITECTURE}" = "i386" ] ; then + ARCHITECTURE=`arch` + if [ "${ARCHITECTURE}" = "i686" ] ; then LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH} diff --git a/base/tps/apache/pki_subsystem_command_wrapper b/base/tps/apache/pki_subsystem_command_wrapper index 19cbf9dd9..4285b767a 100644 --- a/base/tps/apache/pki_subsystem_command_wrapper +++ b/base/tps/apache/pki_subsystem_command_wrapper @@ -78,8 +78,8 @@ OS=`uname -s` ARCHITECTURE="" if [ "${OS}" = "Linux" ] ; then - ARCHITECTURE=`uname -i` - if [ "${ARCHITECTURE}" = "i386" ] ; then + ARCHITECTURE=`arch` + if [ "${ARCHITECTURE}" = "i686" ] ; then LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH} diff --git a/base/tps/scripts/nss_pcache b/base/tps/scripts/nss_pcache index f87d7bbf6..5295abb84 100755 --- a/base/tps/scripts/nss_pcache +++ b/base/tps/scripts/nss_pcache @@ -33,8 +33,8 @@ OS=`uname -s` PLATFORM="" if [ $OS = "Linux" ]; then - PLATFORM=`uname -i` - if [ $PLATFORM = "i386" ]; then + PLATFORM=`arch` + if [ $PLATFORM = "i686" ]; then # 32-bit Linux LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH elif [ $PLATFORM = "x86_64" ]; then |