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

This commit is contained in:
Stephan Raue 2013-07-21 19:04:22 +02:00
commit 3e65a4d3a0
5 changed files with 17 additions and 16 deletions

View File

@ -27,6 +27,9 @@
# ensure that environment is sane # ensure that environment is sane
. /etc/profile . /etc/profile
# wait for network
wait_for_inet_addr force
progress "Starting Avahi Daemon" progress "Starting Avahi Daemon"
mkdir -p /var/run/avahi-daemon mkdir -p /var/run/avahi-daemon

View File

@ -28,6 +28,7 @@ fi
# starting loopback device # starting loopback device
progress "starting loopback device" progress "starting loopback device"
ifconfig lo 127.0.0.1 netmask 255.0.0.0
ifconfig lo up ifconfig lo up
# creating initial settings file # creating initial settings file

View File

@ -21,16 +21,16 @@
wait_for_inet_addr () { wait_for_inet_addr () {
if [ -f $CONFIG_CACHE/openelec/network_wait ]; then if [ -f $CONFIG_CACHE/openelec/network_wait ]; then
. $CONFIG_CACHE/openelec/network_wait . $CONFIG_CACHE/openelec/network_wait
fi
if [ "$WAIT_NETWORK" = "true" ] ; then if [ "$WAIT_NETWORK" = "true" -o "$1" == "force" ] ; then
progress "Wait for network" progress "Wait for network"
[ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10 [ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10
LOOP_COUNT=$((WAIT_NETWORK_TIME * 5)) LOOP_COUNT=$((WAIT_NETWORK_TIME * 5))
for i in $(seq 1 $LOOP_COUNT) ; do for i in $(seq 1 $LOOP_COUNT) ; do
cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l) cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l)
[ $cnt -gt 0 ] && break [ $cnt -gt 0 ] && break
usleep 200000 usleep 200000
done done
fi
fi fi
} }

View File

@ -69,12 +69,6 @@
chmod 600 $DSA2_KEY chmod 600 $DSA2_KEY
fi fi
# Check for predefined known hosts file
if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
progress "SSH: setup predefined known hosts"
cp /etc/ssh/known_hosts $HOME/.ssh
fi
progress "Starting SSH Server" progress "Starting SSH Server"
rm /var/run/sshd.pid &>/dev/null rm /var/run/sshd.pid &>/dev/null
eval $SSHD $OPTIONS eval $SSHD $OPTIONS

View File

@ -34,6 +34,9 @@
if [ "$SAMBA_ENABLED" = "true" ]; then if [ "$SAMBA_ENABLED" = "true" ]; then
# wait for network
wait_for_inet_addr force
progress "Starting Samba server" progress "Starting Samba server"
SMB_USERCONF="/storage/.config/samba.conf" SMB_USERCONF="/storage/.config/samba.conf"