mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
This commit is contained in:
commit
19dbb51213
@ -27,23 +27,20 @@
|
||||
# ensure that environment is sane
|
||||
. /etc/profile
|
||||
|
||||
# wait for network
|
||||
wait_for_inet_addr force
|
||||
|
||||
progress "Starting Avahi Daemon"
|
||||
|
||||
if [ "$DEBUG" = "yes" ]; then
|
||||
AVAHI_DEBUG="--debug"
|
||||
fi
|
||||
|
||||
mkdir -p /var/run/avahi-daemon
|
||||
while true; do
|
||||
AVAHI_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/services/avahi.conf ]; then
|
||||
. $CONFIG_CACHE/services/avahi.conf
|
||||
fi
|
||||
if [ "$AVAHI_ENABLED" == "true" ]; then
|
||||
wait_for_dbus
|
||||
avahi-daemon --syslog > /dev/null 2>&1
|
||||
else
|
||||
break
|
||||
fi
|
||||
usleep 2000000
|
||||
done
|
||||
AVAHI_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/services/avahi.conf ]; then
|
||||
. $CONFIG_CACHE/services/avahi.conf
|
||||
fi
|
||||
if [ "$AVAHI_ENABLED" == "true" ]; then
|
||||
wait_for_dbus
|
||||
rm /var/run/avahi-daemon/pid &>/dev/null
|
||||
avahi-daemon $AVAHI_DEBUG -D --syslog > /dev/null 2>&1
|
||||
fi
|
||||
)&
|
||||
|
@ -34,6 +34,7 @@ progress "mounting needed filesystems"
|
||||
mount -n -t debugfs debugfs /sys/kernel/debug
|
||||
|
||||
if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then
|
||||
[ ! -d $HOME/log ] && rm -rf $HOME/log &>/dev/null
|
||||
mkdir -p $HOME/log
|
||||
ln -sf $HOME/log /var/log
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user