jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-26 04:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2013-02-09 01:10:33 +01:00
commit ff1f7ccbaa
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
View File

@ -31,6 +31,8 @@
<setting id="SAMBA_SECURITY" value="false" /> <setting id="SAMBA_SECURITY" value="false" />
<setting id="SAMBA_USERNAME" value="openelec" /> <setting id="SAMBA_USERNAME" value="openelec" />
<setting id="SAMBA_PASSWORD" value="openelec" /> <setting id="SAMBA_PASSWORD" value="openelec" />
<setting id="SYSLOG_REMOTE" value="false" />
<setting id="SYSLOG_SERVER" value="" />
<setting id="CROND_START" value="false" /> <setting id="CROND_START" value="false" />
<setting id="UPDATE_AUTO" value="manual" /> <setting id="UPDATE_AUTO" value="manual" />
<setting id="X11_KEYMAP" value="us" /> <setting id="X11_KEYMAP" value="us" />

4
packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
View File

@ -50,4 +50,8 @@
<string id="5030">crond</string> <string id="5030">crond</string>
<string id="5031">Start cron daemon at boot</string> <string id="5031">Start cron daemon at boot</string>
<string id="5040">syslog</string>
<string id="5041">Use remote syslog server</string>
<string id="5042">Remote syslog IP address</string>
</strings> </strings>

4
packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
View File

@ -81,5 +81,9 @@
<setting label="5030" type="lsep"/> <setting label="5030" type="lsep"/>
<setting type="sep" /> <setting type="sep" />
<setting id="CROND_START" type="bool" label="5031" default="false" /> <setting id="CROND_START" type="bool" label="5031" default="false" />
<setting label="5040" type="lsep"/>
<setting type="sep" />
<setting id="SYSLOG_REMOTE" type="bool" label="5041" default="false" />
<setting id="SYSLOG_SERVER" type="ipaddress" label="5042" default="" visible="eq(-1,true)" />
</category> </category>
</settings> </settings>

17
packages/sysutils/busybox/init.d/08_syslogd
View File

@ -25,12 +25,21 @@
( (
progress "Starting Syslog daemon" progress "Starting Syslog daemon"
if [ -f /storage/.config/syslog.conf ]; then
syslogd -f /storage/.config/syslog.conf source /var/config/settings.conf
else
syslogd SYSLOGD_OPTIONS="-L"
if [ "$SYSLOG_REMOTE" == "true" -a "$SYSLOG_SERVER" ]; then
SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS -R $SYSLOG_SERVER"
fi fi
if [ -f /storage/.config/syslog.conf ]; then
SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS -f /storage/.config/syslog.conf"
fi
syslogd $SYSLOGD_OPTIONS
progress "Starting Kernellog daemon" progress "Starting Kernellog daemon"
klogd klogd
)& )&