diff --git a/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf.bbappend b/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf.bbappend deleted file mode 100644 index 73c14a2fa..000000000 --- a/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2017 LG Electronics, Inc. - -EXTENDPRAUTO:append = "webosrpi2" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:append = " file://wired-setup" - -do_install:append() { - #Configure wired network interface for raspberrypi - install -d ${D}${datadir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman -} diff --git a/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf/wired-setup b/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf/wired-setup deleted file mode 100644 index a34fe4af5..000000000 --- a/meta-webos-raspberrypi/recipes-connectivity/connman/connman-conf/wired-setup +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -CONF_DIR=/var/lib/connman -if [ ! -d ${CONF_DIR} ]; then - mkdir -p ${CONF_DIR} || true -fi - -if [ ! -e /var/run/dbus/system_bus_socket ] ; then - mkdir -p /var/run/dbus - ln -s /usr/local/var/run/dbus/system_bus_socket /var/run/dbus/system_bus_socket -fi - -nfsroot=0 - -exec 9<&0 < /proc/mounts -while read dev mtpt fstype rest; do - if test $mtpt = "/" ; then - case $fstype in - nfs | nfs4) - nfsroot=1 - break - ;; - *) - ;; - esac - fi -done - -if test $nfsroot -eq 1 ; then - CONFIGF=/var/lib/connman/wired.config - - # Extract wired network config from /proc/cmdline - ipinfo=`cat /proc/cmdline |grep -o ' ip=[^ ]*'` - hostip=`ip addr show dev eth0 | grep -m 1 inet | cut -d/ -f 1 | cut -d"t" -f 2` - gatewayip=`echo $ipinfo | cut -d: -f 3` - dnsip=`echo $ipinfo | cut -d: -f 2` - netmask=`ip addr show dev eth0 | grep -m 1 inet | cut -d/ -f 2 | cut -d" " -f 1` - macaddr=`ifconfig eth0 | grep -o 'HWaddr [^ ]*' | cut -d' ' -f 2` - - # Setup a connman config accordingly - if [ ! -f ${CONFIGF} ] ; then - echo "[service_ethernet]" >> ${CONFIGF} - echo "Type = ethernet" >> ${CONFIGF} - echo "IPv4 =" >> ${CONFIGF} - echo "MAC =" >> ${CONFIGF} - echo "Nameservers =" >> ${CONFIGF} - fi - sed -i -e "s|^IPv4 =.*|IPv4 = ${hostip}/${netmask}/${gatewayip}|" ${CONFIGF} - sed -i -e "s|^MAC =.*|MAC = ${macaddr}|" ${CONFIGF} - sed -i -e "s|^Nameservers =.*|Nameservers = ${dnsip}|" ${CONFIGF} - - # Tell connman to ignore eth0 interface on device cleanup so the existing NFS - # configuration stays as it is - systemctl set-environment CONNMAN_IGNORE_IFACE_ON_CLEANUP=eth0 -fi