From 4fdcb32429dfe14eb6d9c2cf479176e8612e6a9c Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Thu, 9 Dec 2021 17:48:06 +0300 Subject: [PATCH] Fix DHCP trouble and some updates --- .../unknown_unknown_hi3518ev300_openipc_defconfig | 5 +++-- general/overlay/etc/network/interfaces | 2 +- general/overlay/usr/share/udhcpc/default.script | 11 +++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig index 63596909..85a79c27 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig @@ -89,8 +89,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU=y # BR2_PACKAGE_RTL8188EU is not set # BR2_PACKAGE_RTL8188FU_OPENIPC is not set diff --git a/general/overlay/etc/network/interfaces b/general/overlay/etc/network/interfaces index 132708aa..afeb926e 100644 --- a/general/overlay/etc/network/interfaces +++ b/general/overlay/etc/network/interfaces @@ -10,7 +10,7 @@ iface eth0 inet dhcp manual eth0:1 iface eth0:1 inet static - address $(fw_printenv -n ipaddr) + address $(fw_printenv -n ipaddr || echo 192.168.1.10) netmask 255.255.255.0 manual wlan0 diff --git a/general/overlay/usr/share/udhcpc/default.script b/general/overlay/usr/share/udhcpc/default.script index b8164c70..dc4f095b 100755 --- a/general/overlay/usr/share/udhcpc/default.script +++ b/general/overlay/usr/share/udhcpc/default.script @@ -81,10 +81,13 @@ case "$1" in # drop info from this interface # resolv.conf may be a symlink to /tmp/, so take care - TMPFILE=$(mktemp) - grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE - cat $TMPFILE > $RESOLV_CONF - rm -f $TMPFILE + #TMPFILE=$(mktemp) + #grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE + #cat $TMPFILE > $RESOLV_CONF + #rm -f $TMPFILE + + # Clearing the file because it is in RAM + > $RESOLV_CONF # prefer rfc3397 domain search list (option 119) if available if [ -n "$search" ]; then