Changeset b096834


Ignore:
Timestamp:
May 15, 2013 1:04:46 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
aa2715c
Parents:
c1da7f7
Message:

installer/resources/i2prouter: various bugfixes

  • Explicitly specify shell when RUN_AS_USER is set. This allows I2P to start under limited accounts that do not have a defined shell.
  • When installing as a service, point out that I2P_CONFIG_DIR may need to be set. I2P_CONFIG_DIR defaults to $HOME/.i2p for the user that installed I2P and when running as a service this may not be desired. (e.g., RUN_AS_USER=i2p & I2P_CONFIG_DIR=/root/.i2p)

(The RUN_AS_USER shell problem was spotted at https://github.com/mattias-ohlsson/i2p/blob/master/i2p.spec)

Location:
installer/resources
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/i2prouter

    rc1da7f7 rb096834  
    703703        if test -f "/sbin/runuser"
    704704        then
    705             /sbin/runuser - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
     705            /sbin/runuser -s /bin/sh - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
    706706        else
    707             su - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
     707            su - $RUN_AS_USER -s /bin/sh -c "\"$REALPATH\" $ADDITIONAL_PARA"
    708708        fi
    709709        RUN_AS_USER_EXITCODE=$?
     
    17781778
    17791779showsetusermesg()  {
    1780     echo "`gettext 'Please edit $0 and set the variable RUN_AS_USER'`."
     1780    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
    17811781}
    17821782
     
    17861786        showsetusermesg
    17871787        echo
    1788         echo "`gettext 'To run as root anyway, edit $0 and set ALLOW_ROOT=true.'`"
     1788        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
    17891789        exit 1
    17901790    fi
     
    18541854            installdaemon
    18551855            if [ ! `grep ^RUN_AS_USER $0` ]; then
     1856                 echo
    18561857                 showsetusermesg
    18571858            fi
     
    18591860            echo "You may want to disable the browser from launching at startup at"
    18601861            echo "http://127.0.0.1:7657/configclients"
     1862            echo
     1863            echo "I2P_CONFIG_DIR is currently set to $I2P_CONFIG_DIR."
     1864            echo "Change the value in $0 if this is not"
     1865            echo "appropriate for your configuration."
    18611866            ;;
    18621867
  • installer/resources/locale/po/messages_de.po

    rc1da7f7 rb096834  
    190190
    191191#: ../i2prouter:1780
    192 msgid "Please edit $0 and set the variable RUN_AS_USER"
    193 msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
     192msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     193msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
    194194
    195195#: ../i2prouter:1785
     
    198198
    199199#: ../i2prouter:1788
    200 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    201 msgstr ""
    202 "Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
     200msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     201msgstr ""
     202"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
  • installer/resources/locale/po/messages_en.po

    rc1da7f7 rb096834  
    186186
    187187#: ../i2prouter:1780
    188 msgid "Please edit $0 and set the variable RUN_AS_USER"
     188msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    189189msgstr ""
    190190
     
    194194
    195195#: ../i2prouter:1788
    196 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
     196msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    197197msgstr ""
  • installer/resources/locale/po/messages_fr.po

    rc1da7f7 rb096834  
    188188
    189189#: ../i2prouter:1780
    190 msgid "Please edit $0 and set the variable RUN_AS_USER"
     190msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    191191msgstr ""
    192192
     
    197197
    198198#: ../i2prouter:1788
    199 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    200 msgstr ""
     199msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     200msgstr ""
  • installer/resources/locale/po/messages_it.po

    rc1da7f7 rb096834  
    188188
    189189#: ../i2prouter:1780
    190 msgid "Please edit $0 and set the variable RUN_AS_USER"
     190msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    191191msgstr ""
    192192
     
    196196
    197197#: ../i2prouter:1788
    198 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
     198msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    199199msgstr ""
  • installer/resources/locale/po/messages_ru.po

    rc1da7f7 rb096834  
    189189
    190190#: ../i2prouter:1780
    191 msgid "Please edit $0 and set the variable RUN_AS_USER"
     191msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    192192msgstr ""
    193193
     
    197197
    198198#: ../i2prouter:1788
    199 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    200 msgstr ""
     199msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     200msgstr ""
  • installer/resources/locale/po/messages_sv.po

    rc1da7f7 rb096834  
    188188
    189189#: ../i2prouter:1780
    190 msgid "Please edit $0 and set the variable RUN_AS_USER"
    191 msgstr "Var god ändra $0 och sätt variabeln RUN_AS_USER"
     190msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     191msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
    192192
    193193#: ../i2prouter:1785
     
    196196
    197197#: ../i2prouter:1788
    198 msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    199 msgstr "För att köra som root iallafall, ändra $0 och sätt ALLOW_ROOT=true"
     198msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     199msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
Note: See TracChangeset for help on using the changeset viewer.