From patchwork Fri Nov 8 11:48:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1191835 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NJN9dd9O"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478dps0tFcz9sTj for ; Fri, 8 Nov 2019 22:49:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yr0NATLGCOed89bnGQlM7AQkktpiB2Ixc7KcRw/Czdg=; b=NJN9dd9OyDii4e PKk2MbZsbafzBXYM+0VDtOtfhnh+nTNgmbSq6BltFUYrJUrjtJX9tXaBXPqRXg+kmFgN7eA4bUMkD b3Ro2IAkXpDeZPeRKmrLxxJPoD7T7n4EhZFCNStFEGaq4CSiXh21VeCxOcP47L3T0DUc3YKyIWBtL /qGiK1UF3l2PQiUVlReto+PI1AgSB4giQVkoM+APvkJ7/1SJ6JEEpibQYiSrXVZ5kodE3eLcj9LGP atJBFCDlxE8mzxm8qjEAzSKfD9MEORzTosu1t7T/Yo/EVDrGKjfrBDtDyXtVVDip3bsKKX860dNZx mhu9ESX2MJOeYDp7F6qw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT2lV-0007GO-7c; Fri, 08 Nov 2019 11:49:21 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT2l5-0006mb-0P for openwrt-devel@lists.openwrt.org; Fri, 08 Nov 2019 11:48:56 +0000 Received: from buildfff.adridolf.com ([188.192.135.195]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MgNMV-1hzkCw2SHX-00hyNa; Fri, 08 Nov 2019 12:48:45 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 8 Nov 2019 12:48:40 +0100 Message-Id: <20191108114841.1343-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114841.1343-1-freifunk@adrianschmutzler.de> References: <20191108114841.1343-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:L64PlSYcotIJPJ2rcS6y7qB5HW2DnCElU33q+sWL40VIu0EA/zj LYRbSsyzrvKZrqw4qVxamVAC7tDplwk/p42PQPmnt2B4Yhug2eoFNrJ1uBui4YrcD6wth7q h+RbKjQnz2E/Ngru2Es/YRM/pI9jH4gXEewCLK3bnvQY82gqHadfxv/hG2Y9Qqy8xyHHlFD FuxtwD/ha096iINMwBnkQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:yZe6ndrKtso=:b5/jimL9JPGy2uBnQvrTYb tsWrsAiZS9sCuLFeFi6+jz53LlqLsQOXwxwxn4Q699nCfHxsjSuwQ3YHNFqnPNDYtSGN/qm7o VR89rJ95zXt9g4th8UJJ7IUZ/GHUco9mLrfO1UYRDC+2D4g5va1bCkql+5EyudM1HI+l51iN4 rriwr0Ula7DIgeHq1++dWEX0PNhTWgvsPeL0PW+OxT/XidEB2GND/iIPdpEQfjuCu+fdk+kQc Fr6v1+dBPYUkOE69fKG92Sqvh5hLv4Tq4v9LQlcJJr/7SOYlut35gIDQopW8S06x1+wx3WX9Q J9+sWzNGKQyo7OXGjZmQmD0Vmxlec8FaoUhc/WF+tb4jjynR16O6pPtBvvDsfta89hzSLsB2r teyCll+tNCOhOfyusCcTnud/zIppPw6hqClDO153KZh0PliwyCISO2XJ6qb0x9NzfinWkBhUg +hXF0XOSqx/cM5MDhRaEOBcXsh7TL0o3zAn9CzNZ2dlG7dbbJhRoktRGEKiI+CPvvmieKn74E JxDAjRw1aFHWEl/EvamnJz+TCU5ILI2TTecvlbYVD8YlTDUDbRj/v19LYB6PA1POsxw9DLaxV +kgrO5FZJLIm2TPLHiWy/8RpUA6MxqgQfhTj+Qtt5MJFVIt7FV09Dr28Qdog9A31rDu5xShvr P7RwgaukIBGcHRxzbyZoQLJ6GLgzevOucOiSXlHTrO9stmSel+zfzv3KUSx5i+buTBkCH8NAN f9PJeJAkXLvokZSQj/hfynjTcmhIpDyYcQKEXLIjBt4YKs41bTZ/LGRZ04oa2dGDhwVN3GCMG lAcJonL1mhsDpqi19/rt/OkXSR7NOfeaBSgJvyJ017ubrzKW1GCOq1TOWRTDWwEadKHt943Ks pkEucYlAhNA2SPlqSffFyEmp1gcTZrCxABICD2XEk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191108_034855_352454_9AB7E0D7 X-CRM114-Status: UNSURE ( 8.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 1/2] base-files: rename hostname with EUI of mac address X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosy Song Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rosy Song If a label MAC address is provided for device, system will rename the hostname with OpenWrt_. This helps to distinguish between different devices. Since it's no good idea to nest json_* functions, this code does not use get_mac_label directly, but only get_mac_label_dt as external resource. Signed-off-by: Rosy Song [rebased on updated label MAC address storage, extended commit message] Signed-off-by: Adrian Schmutzler --- package/base-files/files/bin/config_generate | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 3ca035ca8b..b473eba9e9 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -3,6 +3,7 @@ CFG=/etc/board.json . /usr/share/libubox/jshn.sh +. /lib/functions/system.sh [ -s $CFG ] || /bin/board_detect || exit 1 [ -s /etc/config/network -a -s /etc/config/system ] && exit 0 @@ -253,9 +254,22 @@ generate_static_system() { add_list system.ntp.server='3.openwrt.pool.ntp.org' EOF + local label_macaddr=$(get_mac_label_dt) + local hostname + + if json_is_a system object; then + json_select system + [ -n "$label_macaddr" ] || json_get_var label_macaddr label_macaddr + json_select .. + fi + + if [ -n "$label_macaddr" ]; then + hostname="OpenWrt-$(macaddr_geteui $label_macaddr)" + uci -q set "system.@system[-1].hostname=$hostname" + fi + if json_is_a system object; then json_select system - local hostname if json_get_var hostname hostname; then uci -q set "system.@system[-1].hostname=$hostname" fi From patchwork Fri Nov 8 11:48:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1191834 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="neBSmhnU"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478dpX4lcgz9sTj for ; Fri, 8 Nov 2019 22:49:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y+qfS6RcdvaCtXCgJCQn4Uwmt4QZPXIDHji8GNzn9N0=; b=neBSmhnUd/5nao 4EOCVrJ4F3raplAXkZ6h5XoOxqOLM1t7RlbX5JMWPuQ49naXv9VkdH9nzsERjSwZl9hcM5sFQqAse 1z+nzb4hkcy2RjbvJYvRgXynTKP72fk/jMeTIP135mqy/OfqAIs9bkIFWWgRK60LJucB5JP62axAz tH4eD3c7dS15y7mBoe2a/1yi8Bgl87RZ8m3A6T8Hsj20f0iV83vkyfSlQIkLfrum9fmzkcazseK5t DMI+MGn3VqpxD35wpzE3pPO4JuJNsSAY3hj5kFZ8P/RUzugRrGs7ECbQTcbS0rCbrdxCHKBvFaeTw 2JRwFUWgC3M2FDxm3/dQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT2lE-0006xg-1q; Fri, 08 Nov 2019 11:49:04 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT2l1-0006ks-O3 for openwrt-devel@lists.openwrt.org; Fri, 08 Nov 2019 11:48:53 +0000 Received: from buildfff.adridolf.com ([188.192.135.195]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MeToK-1hssaf3AUm-00aYWj; Fri, 08 Nov 2019 12:48:45 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 8 Nov 2019 12:48:41 +0100 Message-Id: <20191108114841.1343-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114841.1343-1-freifunk@adrianschmutzler.de> References: <20191108114841.1343-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:s8uh5znUMJ/B6Fg1LeU97M+w/5WX1FNPDQiWpvm9uTE0jbE/VAe vqYtZaFvAARGXRF9V6QvpPa1N5knw5CVMsbBbkru+nraargBq9Mi6KOdinFcOr/UPkbfV9p zmbxhox/WYJP6Vfa2/VuWU6XqgbCboqWgd3HP7DlwjauNfW2bmQ9qKAGzTasCEOZm880fPe pjOFT0gzTxujQ9QP7oZXA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:S8KPSyiROsA=:WTVBwje7dDwQ2e73pZ1Tua 88Yc3UqVhG9WUo3UGGSLLEqinhG2xIe9L3ZCVrKC9dUUCaQ+/nKd9nv5UY8XVC/bZ68ECewXo DUhB7p6LbiNsCTlJIdlQLfnxZoG6ORPinNPLfBZT6NYxVl9XArd/9TGXO01mcu1eMWPFgnlvW V8B471RvvWF1k0N9LfxBUXKEa/bBUY37YVKJJEq04QE3alXn6O915Ci/5b/CJj2OwQO9UsTmL xhsR5Lw2AJL1Dsco+vQjrcslDUqns5W7wd9RUI/QbOMh1fdTHbdPTkq5lhzR604VyFWthPGB3 BzowoM7f+JVKdUwO5Z245DuzeVNrXmzlDXq9vLTYiZI5kIoGc4YAy5pPI+ReDHdiCUY3rnJ2u oHz51pOFl3wdSiWax5WgnYBgC8oxHPy+lfXMZNS6NjMWwR17kRNrPRp+DwkDkVfRcWqL5oWVG 4VwXL3bgs7KjS0yI2lAgT7/uVfQ08N8J4mrgBZZ3IklzSnlx6te2PTWSpacpRJYFnO7ukIwVY iFe+N/T8mf2WRl4u6kdnC7Vxj5MNqV7iSGsI7iWRQZ+y65RHhYSoN/gwe644RSgRuxCwYcba0 nKNwn/rxKGcKYJnKNui+p3JMIRhsY4ZyvoMtrXgSLO3vuqKNqdSCm2h8j+qJZJB1CWDtQfP5/ gMxq4xJRCZvajmbJHuSps4o2n/3cXzHLawhiShB2peCs4UtxCn5JMZviJI3NLZ6t0/AfGEymU oighOkeJEBqeBN2Oh9LPerdsmWhnAd9frMISF/QAmWfOqSpHoa1Y5H0eDy+WaUP5bM7G1rAzo P75NrBgtqD5eYtUQqM1kRVaBhrOXrkm/0JgYBE+oWrAwykkNIZOXCJsrk7F/D5ggteS09QVbu bdybIz6S7KQacp8VQNlpbTRdO0HkXzNuWGt1o+78I= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191108_034852_072268_34CCC4B4 X-CRM114-Status: GOOD ( 10.22 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.131 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 2/2] base-files: rename SSID with EUI of mac address X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosy Song Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org If the label MAC address is provided for a device, the default SSID will be set to contain the EUI of this address, e.g. OpenWrt-ddeeff. With multiple routers, this will help the user to identify his device based on the MAC address printed on the device. If no label MAC address is specified, this will use "OpenWrt" as done before. Using a uci-defaults script for this is necessary as mac80211.sh is executed before /etc/board.json is created, so label MAC addresses set in 02_network would not be available there. Suggested-by: Rosy Song Signed-off-by: Adrian Schmutzler --- This effectively uses a workaround to prevent SSID from being reset after upgrade (match SSID vs. "OpenWrt"). If there is a nicer option, please propose it. Another option for this would be to explicitly mark the wireless uci config as 'default setup' by a to-be-introduced option, which is to be removed in a late uci-defaults script. This could then be exploited for several other objectives, e.g. further config-dependent WiFi setup tasks. --- .../etc/uci-defaults/15_wifi-ssid-mac-address | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/base-files/files/etc/uci-defaults/15_wifi-ssid-mac-address diff --git a/package/base-files/files/etc/uci-defaults/15_wifi-ssid-mac-address b/package/base-files/files/etc/uci-defaults/15_wifi-ssid-mac-address new file mode 100644 index 0000000000..aeb46e39c0 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/15_wifi-ssid-mac-address @@ -0,0 +1,22 @@ +. /lib/functions.sh +. /lib/functions/system.sh + +set_wifi_ssid() { + local iface="$1" + + [ "$(uci get "wireless.${iface}.ssid")" = "OpenWrt" ] && \ + uci set "wireless.${iface}.ssid=$ssid" +} + +label_macaddr=$(get_mac_label) + +[ -n "$label_macaddr" ] || exit 0 + +ssid="OpenWrt-$(macaddr_geteui $label_macaddr)" + +config_load wireless +config_foreach set_wifi_ssid wifi-iface + +uci commit wireless + +exit 0