mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #8732 from mglae/le12_ttyd_ro
ttyd: fix read only mode, improvements, update addon (1)
This commit is contained in:
commit
b7d74e3c3b
@ -4,7 +4,7 @@
|
|||||||
PKG_NAME="ttyd"
|
PKG_NAME="ttyd"
|
||||||
PKG_VERSION="1.7.4"
|
PKG_VERSION="1.7.4"
|
||||||
PKG_SHA256="300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b"
|
PKG_SHA256="300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b"
|
||||||
PKG_REV="0"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
PKG_SITE="https://github.com/tsl0922/ttyd"
|
PKG_SITE="https://github.com/tsl0922/ttyd"
|
||||||
|
@ -7,8 +7,6 @@
|
|||||||
|
|
||||||
oe_setup_addon service.ttyd
|
oe_setup_addon service.ttyd
|
||||||
|
|
||||||
chmod a+x $ADDON_DIR/bin/*
|
|
||||||
|
|
||||||
LD_LIBRARY_PATH=$ADDON_DIR/lib.private:$LD_LIBRARY_PATH
|
LD_LIBRARY_PATH=$ADDON_DIR/lib.private:$LD_LIBRARY_PATH
|
||||||
|
|
||||||
if [ "$TTYD_NOLOGIN" = "true" ]; then
|
if [ "$TTYD_NOLOGIN" = "true" ]; then
|
||||||
@ -17,4 +15,5 @@ elif [ "$TTYD_NOLOGIN" = "false" ]; then
|
|||||||
TTYD_NOLOGIN="login root"
|
TTYD_NOLOGIN="login root"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec $ADDON_DIR/bin/ttyd -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log
|
[ -f "$ADDON_HOME/service.log" ] && mv -f "$ADDON_HOME/service.log" "$ADDON_HOME/service.old.log"
|
||||||
|
exec $ADDON_DIR/bin/ttyd -W -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log
|
||||||
|
@ -1,7 +1,21 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
<?xml version="1.0" ?>
|
||||||
<settings>
|
<settings version="1">
|
||||||
<category label="30000">
|
<section id="service.ttyd">
|
||||||
<setting id="TTYD_WEBPORT" type="text" label="30001" default="11111" />
|
<category id="settings" label="30000" help="">
|
||||||
<setting id="TTYD_NOLOGIN" type="bool" label="30002" default="false" />
|
<group id="1">
|
||||||
</category>
|
<setting id="TTYD_WEBPORT" type="string" label="30001" help="">
|
||||||
|
<level>0</level>
|
||||||
|
<default>11111</default>
|
||||||
|
<control type="edit" format="string">
|
||||||
|
<heading>30001</heading>
|
||||||
|
</control>
|
||||||
|
</setting>
|
||||||
|
<setting id="TTYD_NOLOGIN" type="boolean" label="30002" help="">
|
||||||
|
<level>0</level>
|
||||||
|
<default>false</default>
|
||||||
|
<control type="toggle"/>
|
||||||
|
</setting>
|
||||||
|
</group>
|
||||||
|
</category>
|
||||||
|
</section>
|
||||||
</settings>
|
</settings>
|
||||||
|
@ -3,10 +3,10 @@ Description=ttyd
|
|||||||
After=graphical.target
|
After=graphical.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.ttyd/bin/ttyd.start"
|
ExecStart=/storage/.kodi/addons/service.ttyd/bin/ttyd.start
|
||||||
TimeoutStopSec=1
|
TimeoutStopSec=2
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=2
|
RestartSec=4
|
||||||
StartLimitInterval=0
|
StartLimitInterval=0
|
||||||
Type=exec
|
Type=exec
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user