mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 15:37:49 +00:00
Merge remote-tracking branch 'upstream/master' into openelec-systemd
Conflicts: packages/sysutils/open-vm-tools/package.mk
This commit is contained in:
commit
44504b8c63
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="connman"
|
||||
PKG_VERSION="d052eb3"
|
||||
PKG_VERSION="38c1662"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -28,8 +28,9 @@
|
||||
# ensure that environment is sane
|
||||
. /etc/profile
|
||||
|
||||
if [ -e $CONFIG_CACHE/syslog/remote ] ; then
|
||||
source $CONFIG_CACHE/syslog/remote
|
||||
SYSLOG_REMOTE=false
|
||||
if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then
|
||||
. $CONFIG_CACHE/service_syslog.conf
|
||||
fi
|
||||
|
||||
SYSLOGD_OPTIONS="-L"
|
||||
|
@ -67,4 +67,3 @@ makeinstall_target() {
|
||||
post_install() {
|
||||
enable_service open-vm-tools.service
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user