Changeset 4dc9cfb4


Ignore:
Timestamp:
Jun 5, 2011 8:02:13 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
15b9615
Parents:
1250617
Message:

Debian: re-work patch to compensate for recent runplain.sh & wrapper.config changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-Update-paths.patch

    r1250617 r4dc9cfb4  
    4343--- a/installer/resources/runplain.sh
    4444+++ b/installer/resources/runplain.sh
    45 @@ -11,12 +11,12 @@
     45@@ -11,8 +11,8 @@
    4646 # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
    4747 # should have been replaced by the izpack installer.
     
    5252+I2PTEMP="/tmp"
    5353 
    54  export CP="${I2P}" ; for j in "${I2P}/lib/*"  ; do export CP="${CP}:${j}" ; done;
    55  JAVA=java
    56  
    57 -JAVAOPTS="-Djava.net.preferIPv4Stack=true -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
    58 +JAVAOPTS="-Djava.net.preferIPv4Stack=true -Djava.library.path=/usr/lib/jni:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
    59  nohup ${JAVA} -cp "${CP}" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 &
    60  echo $! > "${I2PTEMP}/router.pid"
     54 # Having IPv6 enabled can cause problems with certain configurations. Changing the
     55 # next value to true may help.
    6156--- a/installer/resources/wrapper.config
    6257+++ b/installer/resources/wrapper.config
     
    8580+wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
    8681 wrapper.java.additional.4.stripquotes=TRUE
    87  wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true
    88  # Jetty says this is a security risk
    89 @@ -117,7 +116,7 @@
     82 
     83 # On some IPv6 enabled systems, I2P and other network-enabled java applications
     84@@ -125,7 +124,7 @@
    9085 # tell the router where to find the wrapper log
    9186 # (change X to the next available number)
     
    9691 # Use the following instead. I2P will find the logfile here,
    9792 # no need for a wrapper.java.additional line too.
    98 @@ -183,7 +182,7 @@
     93@@ -191,7 +190,7 @@
    9994 # you should copy this file, change the location or file name,
    10095 # and edit the i2prouter script to change the WRAPPER_CONF setting
     
    105100 # Use the following instead.
    106101 #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    107 @@ -197,7 +196,7 @@
     102@@ -205,7 +204,7 @@
    108103 #
    109104 # This means i2prouter looks for './i2p.pid'.
Note: See TracChangeset for help on using the changeset viewer.