From patchwork Thu Jan 7 00:40:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Keren X-Patchwork-Id: 564145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5194E1400CB for ; Thu, 7 Jan 2016 11:41:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=g/q8uG8W; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AA88D2805F0; Thu, 7 Jan 2016 01:40:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 146D62805F0 for ; Thu, 7 Jan 2016 01:40:25 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 7 Jan 2016 01:40:25 +0100 (CET) Received: by mail-wm0-f51.google.com with SMTP id f206so78731212wmf.0 for ; Wed, 06 Jan 2016 16:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TPkoneSGugzHJwETTR6cTWC/IS6SUKikuT3Q7KFC0S4=; b=g/q8uG8WViAW2VMeHJhds7im5YHWaa8/Bx7nMtTa2H6GxKA54OAfp44MQ/eNTll9k2 iIEsuKeiWNYnKhvCdzZRjgij/X0JkAg+AFrO8ovCS8r0DmBF1k37XV9ymYjA7vCLPtqG YunmBa0+vxgj2G/iYl7CGuMXsbW2heA9/NCP8IHA/JIGGjGTS+a8lDjEGrdV6QX8TQtK 6fha9NAFwMPWFvr+bzZI35fAjy6FBNUhE1Fh2hsTcoQLs2EGY4wdg26zyfgd5MX3i+yS BvU8nJYMRtr+ewKOihxuGv5JzeGTxouYuKy7pXXU5swvSnaETTTM/wJ/wIkg97I6JoUm xuGw== X-Received: by 10.194.205.5 with SMTP id lc5mr73954977wjc.163.1452127255072; Wed, 06 Jan 2016 16:40:55 -0800 (PST) Received: from debian.localdomain (bzq-79-180-176-71.red.bezeqint.net. [79.180.176.71]) by smtp.gmail.com with ESMTPSA id dl8sm98608341wjb.29.2016.01.06.16.40.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jan 2016 16:40:53 -0800 (PST) From: Tal Keren To: openwrt-devel@lists.openwrt.org Date: Thu, 7 Jan 2016 02:40:45 +0200 Message-Id: <1452127248-21017-1-git-send-email-kooolk@gmail.com> X-Mailer: git-send-email 2.6.4 Subject: [OpenWrt-Devel] [PATCH 1/4] base-files: add option to specify netdev led mode in configuration generation X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This is necessary for controlling leds of RJ45 port, when one indicate the link status and the other indicate data transfer. Signed-off-by: Tal Keren --- package/base-files/files/bin/config_generate | 7 ++++--- package/base-files/files/lib/functions/uci-defaults.sh | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 9218788..4f257e4 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -257,11 +257,12 @@ generate_led() { ;; netdev) - local device - json_get_vars device + local device mode + json_get_vars device mode + [ -n "$mode" ] || mode='link tx rx' uci -q batch <<-EOF set system.$cfg.trigger='netdev' - set system.$cfg.mode='link tx rx' + set system.$cfg.mode='$mode' set system.$cfg.dev='$device' EOF ;; diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index de3f180..c0ff98a 100755 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -355,6 +355,7 @@ ucidef_set_led_netdev() { local name="$2" local sysfs="$3" local dev="$4" + local mode="$5" json_select_object led @@ -363,6 +364,7 @@ ucidef_set_led_netdev() { json_add_string type netdev json_add_string sysfs "$sysfs" json_add_string device "$dev" + [ -n "$mode" ] && json_add_string mode "$mode" json_select .. json_select ..