mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 07:27:49 +00:00
connman: use our new options dialog
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
73a81881ed
commit
17d59bdac7
@ -27,8 +27,22 @@
|
|||||||
# WLAN: (WPA2): SSID, NAME, PASSPHRASE, tech: wifi mode: _managed_psk
|
# WLAN: (WPA2): SSID, NAME, PASSPHRASE, tech: wifi mode: _managed_psk
|
||||||
# WLAN: (WEP): SSID, NAME, PASSPHRASE, tect: wifi mode: _managed_wep
|
# WLAN: (WEP): SSID, NAME, PASSPHRASE, tect: wifi mode: _managed_wep
|
||||||
|
|
||||||
[ -f $HOME/.config/network.conf ] && . $HOME/.config/network.conf
|
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
|
||||||
|
|
||||||
|
if [ -f "$OPENELEC_SETTINGS" ]; then
|
||||||
|
HOSTNAME=`grep NET_HOSTNAME $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
NETWORK=`grep NET_NETWORK $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
IFACE=`grep NET_IFACE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
IPADDRESS=`grep NET_IPADDRESS $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
GATEWAY=`grep NET_GATEWAY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
NAMESERVER=`grep NET_NAMESERVER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
SSID=`grep NET_SSID $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
SECURITY=`grep NET_SECURITY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
PASSPHRASE=`grep NET_PASSPHRASE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||||
|
fi
|
||||||
|
|
||||||
[ -z "$HOSTNAME" ] && HOSTNAME="openelec"
|
[ -z "$HOSTNAME" ] && HOSTNAME="openelec"
|
||||||
|
[ -z "$IFACE" ] && IFACE="eth0"
|
||||||
|
|
||||||
# setup hostname
|
# setup hostname
|
||||||
progress "Setup hostname"
|
progress "Setup hostname"
|
||||||
@ -53,7 +67,6 @@
|
|||||||
# NETWORK: ( LAN / WLAN )
|
# NETWORK: ( LAN / WLAN )
|
||||||
usleep 2000000 # TODO: wait on udev to load all drivers
|
usleep 2000000 # TODO: wait on udev to load all drivers
|
||||||
|
|
||||||
[ -z "$IFACE" ] && IFACE="eth0"
|
|
||||||
[ -f /sys/class/net/$IFACE/address ] && \
|
[ -f /sys/class/net/$IFACE/address ] && \
|
||||||
IFACE=`cat /sys/class/net/$IFACE/address | sed 's/://g'`
|
IFACE=`cat /sys/class/net/$IFACE/address | sed 's/://g'`
|
||||||
|
|
||||||
|
@ -31,14 +31,10 @@ mkdir -p $INSTALL/etc
|
|||||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||||
cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
|
cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
|
||||||
|
|
||||||
#mkdir -p $INSTALL/usr/lib/connman/plugins
|
|
||||||
# cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/sbin
|
mkdir -p $INSTALL/usr/sbin
|
||||||
cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
|
cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/config
|
mkdir -p $INSTALL/usr/config
|
||||||
cp $PKG_DIR/config/network.conf $INSTALL/usr/config
|
|
||||||
cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
|
cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
|
||||||
|
|
||||||
if [ "$DEVTOOLS" = yes ]; then
|
if [ "$DEVTOOLS" = yes ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user