jellyfin && xunyou: auto detect iface and kernel version (#5)
* luci-app-jellyfin: auto detect image * xunyou: auto detect lan iface
This commit is contained in:
练亮斌
GitHub
parent
d932d24509
commit
2e7562d040
@ -3,7 +3,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_VERSION:=1.0.3
|
||||
PKG_RELEASE:=20211015
|
||||
PKG_RELEASE:=20211103
|
||||
|
||||
LUCI_TITLE:=LuCI support for jellyfin
|
||||
LUCI_PKGARCH:=all
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
config jellyfin
|
||||
option 'port' '8096'
|
||||
option 'image' 'jjm2473/jellyfin-rtk:latest'
|
||||
option 'image' 'default'
|
||||
option 'media_path' '/mnt/sda1/media'
|
||||
option 'config_path' '/root/jellyfin/config'
|
||||
option 'cache_path' ''
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
#!/bin/sh
|
||||
|
||||
image_name=`uci get jellyfin.@jellyfin[0].image 2>/dev/null`
|
||||
|
||||
if [ "$image_name" == "jjm2473/jellyfin-rtk:latest" ]; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set jellyfin.@jellyfin[0].image="default"
|
||||
commit jellyfin
|
||||
EOF
|
||||
fi
|
||||
exit 0
|
||||
@ -2,7 +2,14 @@
|
||||
|
||||
image_name=`uci get jellyfin.@jellyfin[0].image 2>/dev/null`
|
||||
|
||||
[ -z "$image_name" ] && image_name="jjm2473/jellyfin-rtk:latest"
|
||||
[ -z "$image_name" ] && image_name="default"
|
||||
|
||||
if [ "$image_name" == "default" ]; then
|
||||
image_name="jjm2473/jellyfin-rtk:latest"
|
||||
if uname -r | grep -q '^4\.9\.'; then
|
||||
image_name="jjm2473/jellyfin-rtk:4.9-latest"
|
||||
fi
|
||||
fi
|
||||
|
||||
install(){
|
||||
local media=`uci get jellyfin.@jellyfin[0].media_path 2>/dev/null`
|
||||
|
||||
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
|
||||
PKG_NAME:=xunyou
|
||||
PKG_VERSION:=0.1.1
|
||||
PKG_VERSION:=1.0.9.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
"version":"1.0.9.1",
|
||||
"built-in":false,
|
||||
"httpd-port":2389,
|
||||
"route-mac":"02:44:cd:b0:1e:21",
|
||||
"route-mac":"00:00:00:00:00:00",
|
||||
"httpd-svr":"192.168.100.1",
|
||||
"net-device":"eth1",
|
||||
"net-device":"br-lan",
|
||||
"upgrade-shell":"/xunyou/scripts/xunyou_upgrade.sh",
|
||||
"user-info":"/xunyou/configs/xunyou-user",
|
||||
"device-info":"/xunyou/configs/xunyou-device_v2",
|
||||
"game-info":"/xunyou/configs/xunyou-game",
|
||||
"log":"/xunyou/log/xunyou-ctrl.log",
|
||||
"ipset-enable":0,
|
||||
"product-vendor":"KOOLSHARE",
|
||||
"product-vendor":"LINKEASE",
|
||||
"product-model":"ARS2",
|
||||
"product-version":"r11785-5f5baed2b2",
|
||||
"product-version":"V1",
|
||||
"routeList":{
|
||||
"ipWNetT":"tcp_white_net",
|
||||
"ipGNetT":"tcp_grey_net",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,14 +0,0 @@
|
||||
[I][09-15 17:08:37] [create_route_tcp_proxy:254] create route tcp proxy success!
|
||||
[I][09-15 17:08:37] [create_epoll_handle:317] [epoll] create epoll handle, epoll fd = 7.
|
||||
[I][09-15 17:08:37] [create_epoll_handle:317] [epoll] create epoll handle, epoll fd = 8.
|
||||
[I][09-15 17:08:37] [create_epoll_handle:317] [epoll] create epoll handle, epoll fd = 9.
|
||||
[I][09-15 17:08:37] [create_tcp_proxy_event_handle:423] create tcp proxy event handle success! zTcpReqEvFd : 7, zTcpConEvFd : 8, zTcpRspEvFd : 9.
|
||||
[I][09-15 17:08:38] [create_route_udp_proxy:302] create route udp proxy success!
|
||||
[I][09-15 17:08:38] [create_epoll_handle:317] [epoll] create epoll handle, epoll fd = 11.
|
||||
[I][09-15 17:08:38] [create_udp_proxy_event_handle:442] create udp proxy event handle success! zUdpRspEvFd : 11.
|
||||
[I][09-15 17:08:38] [create_socket_domain:164] [socket] create new udp unix domain socket fd = [12] success.
|
||||
[I][09-15 17:08:38] [proxy_client_tcp_request:473] proxy client tcp request pthread ID = 9628.
|
||||
[I][09-15 17:08:38] [proxy_tcp_client_connect:571] proxy listen tcp connect event pthread ID = 9629.
|
||||
[I][09-15 17:08:38] [proxy_server_tcp_response:194] proxy client tcp response pthread ID = 9630.
|
||||
[I][09-15 17:08:38] [proxy_client_udp_request:556] proxy client udp request pthread ID = 9631.
|
||||
[I][09-15 17:08:38] [manage_thread:321] proxy control manage pthread ID = 9633.
|
||||
@ -1,5 +0,0 @@
|
||||
[2021-09-11 18:05:46] [app]: 启动迅游模块！
|
||||
[2021-09-11 18:05:54] ctrl process is not running, now restart it.
|
||||
[2021-09-11 18:05:55] proxy process is not running, now restart it.
|
||||
[2021-09-11 23:01:35] ctrl process is not running, now restart it.
|
||||
[2021-09-15 17:08:29] iptables nat rule does not exist
|
||||
@ -3,7 +3,16 @@
|
||||
source /etc/profile
|
||||
|
||||
BasePath=""
|
||||
ifname="eth1"
|
||||
|
||||
ifname=$(
|
||||
. /lib/functions/network.sh
|
||||
|
||||
network_is_up "lan" || exit 1
|
||||
network_get_device device "lan"
|
||||
printf "%s " "${device:-br-lan}"
|
||||
)
|
||||
[ -z "$ifname" ] && ifname="br-lan"
|
||||
|
||||
XunyouPath="${BasePath}/xunyou"
|
||||
LibPath="${XunyouPath}/lib"
|
||||
kernelKoPath="${XunyouPath}/modules"
|
||||
|
||||
@ -4,7 +4,15 @@ source /etc/profile
|
||||
|
||||
systemType=0
|
||||
action=$1
|
||||
ifname="eth1"
|
||||
ifname=$(
|
||||
. /lib/functions/network.sh
|
||||
|
||||
network_is_up "lan" || exit 1
|
||||
network_get_device device "lan"
|
||||
printf "%s " "${device:-br-lan}"
|
||||
)
|
||||
[ -z "$ifname" ] && ifname="br-lan"
|
||||
|
||||
UdpPostProc="udp-post"
|
||||
product_model=`uname -n`
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user