diff -crB old/etc/ca-certificates/update.d/jks-keystore new/etc/ca-certificates/update.d/jks-keystore *** old/etc/ca-certificates/update.d/jks-keystore 2009-07-15 07:10:19.000000000 +0200 --- new/etc/ca-certificates/update.d/jks-keystore 2009-10-19 21:05:46.632974519 +0200 *************** *** 15,32 **** exit 0 fi ! for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do ! if [ -x $jvm/bin/keytool ]; then ! break fi ! done ! ! if [ ! -x $jvm/bin/keytool ]; then ! exit 0 fi - export JAVA_HOME=$jvm - PATH=$JAVA_HOME/bin:$PATH # read lines of the form: [+-]/etc/ssl/certs/*.pem echo "updating keystore $KEYSTORE..." --- 15,31 ---- exit 0 fi ! if [ ! -x $(which keytool) ]; then ! if [ -n "${JAVA_HOME}" ]; then ! if [ -x "${JAVA_HOME}/bin/keytool" ]; then ! PATH=${JAVA_HOME}/bin/:${PATH} ! else ! echo "keytool not found" ! exit 1 fi ! fi fi # read lines of the form: [+-]/etc/ssl/certs/*.pem echo "updating keystore $KEYSTORE..." diff -crB old/usr/sbin/init-jks-keystore new/usr/sbin/init-jks-keystore *** old/usr/sbin/init-jks-keystore 2009-07-15 07:10:19.000000000 +0200 --- new/usr/sbin/init-jks-keystore 2009-10-19 21:06:42.014458661 +0200 *************** *** 1,15 **** #!/bin/bash ! for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do ! if [ -x $jvm/bin/keytool ]; then ! break fi - done - if [ ! -x $jvm/bin/keytool ]; then - echo "No supported JRE installed" - exit 1 fi - export JAVA_HOME=$jvm - PATH=$JAVA_HOME/bin:$PATH KEYSTORE=/etc/ssl/certs/java/cacerts storepass='changeit' --- 1,15 ---- #!/bin/bash ! ! if [ ! -x $(which keytool) ]; then ! if [ -n "${JAVA_HOME}" ]; then ! if [ -x "${JAVA_HOME}/bin/keytool" ]; then ! PATH=${JAVA_HOME}/bin/:${PATH} ! else ! echo "keytool not found" ! exit 1 ! fi fi fi KEYSTORE=/etc/ssl/certs/java/cacerts storepass='changeit'