From patchwork Fri Nov 8 12:05:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1191841 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="rX4K9vmB"; 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 478f9f5GZqz9sST for ; Fri, 8 Nov 2019 23:05:42 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7gn63RnBbp7qEpZe5kDya6S/2Kcp32voxSVCtNGNRQ8=; b=rX4K9vmBj12DwH gXPiD3XwroOmOKfZkC8FyHuIYOMgecrOiwriPN5wpHh4BLG4I5hDqTm9zYBrANxVCepq2PHgmQoY9 C+rPfXfNqHi3JBZBNZ9V6b0WfJJM58CBZ9HjXuhzY3NrLoSfUpXqAw5/lmCKjIqJkA+S8tBd+pK29 8S/TORZvBt2pKVIRhTLawwKelXrhysYbbfWdH4ZExY5X3bJcmYW2d76Nm9ROQs1FjF2tsF0lK4Ju8 NR64oFe3lYrVPm5UHnSuN6PUUFnLFrZ+0ly9rQ+/UPuM4xzpT6PoBY+2SpcBhtl8sg1zZy7ClAJ+S qDDTTLGFumX40Ur4I+Cg==; 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 1iT31G-0007j3-NA; Fri, 08 Nov 2019 12:05:38 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT315-0007XF-Jq for openwrt-devel@lists.openwrt.org; Fri, 08 Nov 2019 12:05:29 +0000 Received: from buildfff.adridolf.com ([188.192.135.195]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MC2o9-1ichfU2Grd-00CT70 for ; Fri, 08 Nov 2019 13:05:25 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 8 Nov 2019 13:05:19 +0100 Message-Id: <20191108120520.1966-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:Zpc2H6TBezcmTpOsNcptu8pKT9ys9lwySui2Mqu5Q2D63gV9jXq Uf7yk4xaEaDh884qcWg2Muz6AlKfawqsajIVTwjT0SdIAsWnLDMUKKetxgr7p3argzxTFbP mwkMXDKttZL1+nTei53wgcDGyvITMd4i2zwlVRhrw5nue10eXVk+2sdyOwICM/6lZsJUlA6 VHLyl3i+udjUV1oP4RJMg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:TQHn8lHxW+8=:fDMoQM6aE6WC5B66TBv4XB aYqZJL/oKPHMNXg4OGpNnleh3v0NE4iInsYz+gYHn7sdzQYL4PiFyAXMzd0lB5DD0wYBExDI7 hVIrL/8y+Ek6/CvCXJjZmo3WUW61W1tnMpgEgEtaOmGsWgUWxs1Sz66WTlWU9nNODiTkLRaVr 23j71OpDTTpE35IMcSiD7up4VjJylNinDU6A9I2RzIm9qEQsDcdrWyMUHKdy1Fioh2pSqyElN 958LJaYnhvfh2uBtqjLIZYWTEvzlq6eFfSf4CUn0OriwMFRcwtqaOI+EHLVlbMrhc1awK90Lq w3khnidIhBw0xYgAwpk2KJj10l1zLD157NWx3jcn0XWecwexlAgUhujP/ZKywD7/1IxCU3PVZ o7CopSGKQi5vyb3VyrdBvPe+9ksPnJ3fWrpT51EVInRg2h1rkDIrnjV6C46H5RQlnB4tCdGDc mtkSqR0XLKVglEwk2fqukJw2A9U9CjW/VsY1C2Cwz/5d8sG0Z89b+zTMXMcWuTOXadf99QNh7 jqFO0p9eXamOemDEpi8DylAGFQa69Ks1LCwOj1nHDCZlht/Qu4ba6qEQzgHiQsnBxsiXrm13D GTmSthIfnSEeHiwzp+L7T0GjeFg6BlWT7NHt0u64lGbtFz5rr73a8s/vgmosMTviHzApWtik4 DYcZmf5UVe9k2l/3OsraY2nNfnpPmCUXHKXQDMuHl042pXG5HoB3POwViJRwNuVnu8URkbj8b m/mxBQVNyry/2AJBDSIA/PJeL/hBsgd3xfJZH9WNmydJRUWyNLWxM13Y+qXLh/sMgzmIbZ7PU pR06Vb+OL7r3NUH3h8MQ0EpXWvnuHLjeiHA9xA6/aq7kEIJmekEbl9aQ0Yv6/NCasmd8Vs4pK 8fJmp2fBRvyraXiv6wMx4dWEqBeCJLfSyg0UQdfb0= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191108_040528_464440_0029F92C X-CRM114-Status: GOOD ( 10.66 ) 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.133 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 1/2] base-files: indicate initial setup by uci system config option 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This provides a uci system config setting that will be set only during initial setup. This can be used by uci-defaults script to determine whether they are run during initial setup or after a sysupgrade. Since the setting is removed again after uci-defaults have been processed, it won't be recognized by the user on the running device, but can be exploited also for downstream setup tasks. Signed-off-by: Adrian Schmutzler --- package/base-files/files/bin/config_generate | 1 + .../base-files/files/etc/uci-defaults/90_end-initial-setup | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 package/base-files/files/etc/uci-defaults/90_end-initial-setup diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index b473eba9e9..273561229a 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -243,6 +243,7 @@ generate_static_system() { set system.@system[-1].ttylogin='0' set system.@system[-1].log_size='64' set system.@system[-1].urandom_seed='0' + set system.@system[-1].initial_setup='1' delete system.ntp set system.ntp='timeserver' diff --git a/package/base-files/files/etc/uci-defaults/90_end-initial-setup b/package/base-files/files/etc/uci-defaults/90_end-initial-setup new file mode 100644 index 0000000000..779d858d5f --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/90_end-initial-setup @@ -0,0 +1,4 @@ +uci -q delete system.@system[0].initial_setup +uci commit system + +exit 0 From patchwork Fri Nov 8 12:05:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1191842 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="iqxuDTpf"; 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 478f9n6Fdhz9sWH for ; Fri, 8 Nov 2019 23:05:47 +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: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:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Qdvl5uRum2DLfYeUL5IpGDyAA4NBB5qQRn6d/ct/Mrg=; b=iqxuDTpfG6ttsLmFUK93nQi4WQ pR7YJzn0/x1Ds/pF5rhwTqmGEX6sDf5GGQ8I3wprye0qW0oayWUCTnsS3/oZ5i7LrJ39DpKuBsIWX i+R1UrBs0Xbdso2o3jLhBHT8YMDR3xfflM3Fby1iT9hBgrUQU8k+xnFQ1dXTSLR0r7IcyQrSiYpKN 28KmpGfzy3PKFlHVnpFj+ZljRe/m5zyJpNBhCzmlErlelmihiHFcPMSDDS1WeDJ0tlPYDL0hJkF0V vPtY4dKjzXlbrgpupCxq7cv6+NOTWmmsmtVjk0In5a/cv9kXEFwSHCqav3myF25dZZNk1HlJmk6CC PpF+V5mA==; 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 1iT319-0007YJ-0g; Fri, 08 Nov 2019 12:05:31 +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 1iT315-0007XK-P0 for openwrt-devel@lists.openwrt.org; Fri, 08 Nov 2019 12:05:29 +0000 Received: from buildfff.adridolf.com ([188.192.135.195]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MkYHO-1i4Suh32Rq-00m56z for ; Fri, 08 Nov 2019 13:05:25 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 8 Nov 2019 13:05:20 +0100 Message-Id: <20191108120520.1966-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108120520.1966-1-freifunk@adrianschmutzler.de> References: <20191108120520.1966-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:uNUA8s0CtqMEA8/+BCP8ozWgJQh9qDwFQ3SvFJcEO9PL/dH1fwJ leavpHNZ3b63IgxdTNBf4Q5nUJealvn/2Cqfehgl1pr+MVroIIA/6lkA4dVTchc57CPhgP1 BLCWrULIVVDha0twYV7eLq2SSEPZbNUcY0OJXo/fir9gFrAeLTTXdQI3jB1vlQvruUAgNVH hVExbT0Wac4cmpcSnUySA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:0zYqH3lh9TE=:SuscYozGQ26OQRIDla5gfK NDaCTItyzEW+M4wJYCgogC+fuvOypzR06Jazl7NWL6q5quBYBbOrKqSr08LTnR3o8oU7J+y+h pAPxoRIOBfi/NpFmSrOG9gG7U5TwY5z/O5RN4sXEH9moyX0OujE/M2WxSgp45V1lFiN0bBwiD RdqY/n8FKKLLEDrJvjLXHY3o+vk4EUiaBGnnSX1OUgtqGXFF/KpwhBhe12GMg26qGdE/MJuao GW+KHQviTxzDDqgq9j5Kzfwq6E1WnehykrLmVIsiBRFUsTn+Vl32wEQnaMgOSsClza2LtL0qH 40XRsw3NBrPtf+rIByq3o7HQv2Qm3BGcloEhnYKc52mX+pEAuTp0pR7O7VhH3kTuLZPepdvv7 OfCWkbk1wNY+k87Dd9X+b+QexhUcgFpe5cdG9UZyGGH/DTsT2+MKBxmHK5uyFvS1WcGt5pndg 3VH/KaAUTAjxgMZX0rcRM9wZQUeu2xMF0u+Kk9Jovo0SxxS83Cdhe4oydvWYhl7GnfNP1Mjc1 c7mtJ7j1DGERJlRarTZewNBRthoqwiJPglM/WzN/O8DxI6wFnt5lIS2MywrBb4IvjT3Ief/QD Lsje8a1AR1Lv1onsxqapU7+5R5iP6dDHdfz/gC5um9Wfa5OkzMlPuitp1l7RrUOwbdrhb0wCp AhbjwBkONgRx9B2j38HNt2QHO0IxiBv2OiBgN4KlgAFemJ916Rg8r4pgRQ03y2Wgq+52dnnSk vx6qythYuSK7HZ5OubM9fFZ1wi5ydDtUipI1LfHMgJZddSYTLQByCd5UHVF96yshja1S3eGzq Bua17xG9NaLw3aacr5Ep7hfLxo/Xi99tQc1g7uvp1MQB4ZQmuOoh/Q5PAYvx1+gZFpht3gsX7 oCTQbOyiMbkmesMcL2cHgsj2AERyzcOiP1tlQHiJw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191108_040528_464108_55888EAF X-CRM114-Status: UNSURE ( 9.96 ) 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.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: use initial_setup indicator to improve SSID setup 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org By exploiting the new initial_setup option, default SSID setup can be improved so it does not have to rely on the previous SSID value anymore. Signed-off-by: Adrian Schmutzler --- This patch is a proof-of-concept based on the SSID EUI patch as just submitted. It's mainly intended to show the use of the initial_setup option. --- .../files/etc/uci-defaults/15_wifi-ssid-mac-address | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index aeb46e39c0..2ec66b52dd 100644 --- 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 @@ -1,11 +1,12 @@ . /lib/functions.sh . /lib/functions/system.sh +[ "$(uci get "system.@system[0].initial_setup")" = "1" ] || exit 0 + set_wifi_ssid() { local iface="$1" - [ "$(uci get "wireless.${iface}.ssid")" = "OpenWrt" ] && \ - uci set "wireless.${iface}.ssid=$ssid" + uci set "wireless.${iface}.ssid=$ssid" } label_macaddr=$(get_mac_label)