From 6d4ff0f3471211dd59e53bfbd107c91ce9932856 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:24:40 +0100 Subject: [PATCH] Fix wireless-configuration to properly overwrite files (#677) Co-authored-by: Viktor --- .../package/wireless-configuration/files/netsetup | 2 +- .../wireless-configuration.mk | 15 +-------------- .../wireless-configuration.sh | 7 +++++++ 3 files changed, 9 insertions(+), 15 deletions(-) create mode 100755 general/package/wireless-configuration/wireless-configuration.sh diff --git a/general/package/wireless-configuration/files/netsetup b/general/package/wireless-configuration/files/netsetup index 14e008c2..a6415d40 100755 --- a/general/package/wireless-configuration/files/netsetup +++ b/general/package/wireless-configuration/files/netsetup @@ -19,10 +19,10 @@ fi if [ $1 = "startup" ]; then /etc/network/netadapter $1 ifconfig eth0 192.168.2.10 - ifup wlan0 fi if [ $1 = "shutdown" ]; then + killall -q udhcpd killall -q wpa_supplicant /etc/network/netadapter $1 fi diff --git a/general/package/wireless-configuration/wireless-configuration.mk b/general/package/wireless-configuration/wireless-configuration.mk index 4486b4aa..642b3817 100644 --- a/general/package/wireless-configuration/wireless-configuration.mk +++ b/general/package/wireless-configuration/wireless-configuration.mk @@ -9,19 +9,6 @@ WIRELESS_CONFIGURATION_SITE = WIRELESS_CONFIGURATION_LICENSE = MIT WIRELESS_CONFIGURATION_LICENSE_FILES = LICENSE -WIRELESS_CONFIGURATION_PATH = ../general/package/wireless-configuration/files - -define WIRELESS_CONFIGURATION_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - cp -f $(WIRELESS_CONFIGURATION_PATH)/udhcpd.conf $(TARGET_DIR)/etc - - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/network - cp -f $(WIRELESS_CONFIGURATION_PATH)/interfaces $(TARGET_DIR)/etc/network - cp -f $(WIRELESS_CONFIGURATION_PATH)/netadapter $(TARGET_DIR)/etc/network - cp -f $(WIRELESS_CONFIGURATION_PATH)/netsetup $(TARGET_DIR)/etc/network - - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin - cp -f $(WIRELESS_CONFIGURATION_PATH)/wireless $(TARGET_DIR)/usr/sbin -endef +BR2_ROOTFS_POST_BUILD_SCRIPT += $(WIRELESS_CONFIGURATION_PKGDIR)/wireless-configuration.sh $(eval $(generic-package)) diff --git a/general/package/wireless-configuration/wireless-configuration.sh b/general/package/wireless-configuration/wireless-configuration.sh new file mode 100755 index 00000000..787b4aba --- /dev/null +++ b/general/package/wireless-configuration/wireless-configuration.sh @@ -0,0 +1,7 @@ +#!/bin/bash +FILES=../general/package/wireless-configuration/files +cp -f $FILES/udhcpd.conf $TARGET_DIR/etc +cp -f $FILES/interfaces $TARGET_DIR/etc/network +cp -f $FILES/netadapter $TARGET_DIR/etc/network +cp -f $FILES/netsetup $TARGET_DIR/etc/network +cp -f $FILES/wireless $TARGET_DIR/usr/sbin