Revert "connman: start init scripts on RUNLEVEL=boot"

This reverts commit 0946759631cf88a9f79dad92825fe3fc7d0ded3e.
This commit is contained in:
Stephan Raue 2011-09-12 19:27:26 +02:00
parent 10c55d8e49
commit 55845ca002

View File

@ -22,30 +22,28 @@
# #
# runlevels: openelec, installer, textmode # runlevels: openelec, installer, textmode
case $RUNLEVEL in if [ -f /var/config/settings.conf ]; then
boot)
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf . /var/config/settings.conf
# save original interface names (eth0, eth1) # save original interface names (eth0, eth1)
NET_IFACE_NAME=$NET_IFACE NET_IFACE_NAME=$NET_IFACE
NET2_IFACE_NAME=$NET2_IFACE NET2_IFACE_NAME=$NET2_IFACE
fi fi
[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec" [ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
# setup hostname # setup hostname
progress "Setup hostname" progress "Setup hostname"
echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
# create /etc/hosts file, useful for gethostbyname(localhost) # create /etc/hosts file, useful for gethostbyname(localhost)
progress "creating /etc/hosts" progress "creating /etc/hosts"
echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
# add user defined hosts.conf entry's # add user defined hosts.conf entry's
[ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
( (
# setup Networking 1 # setup Networking 1
progress "setup Networking 1" progress "setup Networking 1"
@ -170,7 +168,7 @@ case $RUNLEVEL in
[ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3" [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
[ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
( (
# wait some time, put eth1 (NET2_IFACE) down and then up # wait some time, put eth1 (NET2_IFACE) down and then up
# this is just temporary solution until I figure out how to # this is just temporary solution until I figure out how to
# do properly with connman # do properly with connman
@ -178,7 +176,7 @@ case $RUNLEVEL in
ifconfig $NET2_IFACE_NAME down ifconfig $NET2_IFACE_NAME down
usleep 1000000 usleep 1000000
ifconfig $NET2_IFACE_NAME up ifconfig $NET2_IFACE_NAME up
)& )&
fi fi
# END OF NETWORK 2 # END OF NETWORK 2
@ -195,9 +193,4 @@ case $RUNLEVEL in
/usr/sbin/connmand -n > /dev/null 2>&1 /usr/sbin/connmand -n > /dev/null 2>&1
usleep 250000 usleep 250000
done done
)& )&
;;
poweroff|reboot)
;;
esac