From patchwork Thu Oct 23 13:40:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeremy Rosen X-Patchwork-Id: 402507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5F6541400DD for ; Fri, 24 Oct 2014 00:40:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AB6FB91AB0; Thu, 23 Oct 2014 13:40:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id haZEJ4RPAMkQ; Thu, 23 Oct 2014 13:40:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3066A91924; Thu, 23 Oct 2014 13:40:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EE3251C223D for ; Thu, 23 Oct 2014 13:40:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAC8AA1BD8 for ; Thu, 23 Oct 2014 13:40:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a5V3DvSOOqoT for ; Thu, 23 Oct 2014 13:40:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3D9EFA1541 for ; Thu, 23 Oct 2014 13:40:12 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id q5so733021wiv.4 for ; Thu, 23 Oct 2014 06:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=1XY2VUfAl5gZWXtKwqT7REy5cpTrt63T5a8Jt+MtQAs=; b=wDVscGbPpNESbqYYVS3XzdXZjbdqnJRmIAgHFqaNP7UcPAeCfKRUzRmlRUn23yJvvz hJxYNy7ubwrFOvmB441pCYZWInqzPtpDSzAyePoijDxSReMNmfuOn4fo/pFP6OK/R6Jk h36eT6vZjByZLw836cq6D5Wvww4820RQZHO3Z96BLi7VHJQNylDzu4DndwVBKxTm4VR1 kUjrZHtVL53qNWbzVMrJq74wIhvsE9G/z+gTNIsK5LhJtXreROQBENDSp/c5Mgu1hwIZ 9OGzklbtYr6pXQf+7ijZglRPLkVA81FLrOYfDPxSSas//r65fKwQDDaVuhmY7yvv9mWW eA9g== X-Received: by 10.180.91.234 with SMTP id ch10mr45056602wib.60.1414071609678; Thu, 23 Oct 2014 06:40:09 -0700 (PDT) Received: from pcrosen.daviel.openwide.fr. ([193.56.60.161]) by mx.google.com with ESMTPSA id b6sm2622886wiy.22.2014.10.23.06.40.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Oct 2014 06:40:08 -0700 (PDT) From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= To: buildroot@buildroot.org Date: Thu, 23 Oct 2014 15:40:00 +0200 Message-Id: <1414071600-28318-1-git-send-email-jeremy.rosen@openwide.fr> X-Mailer: git-send-email 2.1.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3] set simple network setup via the system configuration submenu X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch allows the setup of simple /etc/network/interfaces (or /etc/systemd/network/80-buildroot.network if networkd is enabled) via the configuration menus instead of using an overlay * supports disabling the interface * supports manual ipv4 configuration * supports dhcp configuration Signed-off-by: Jérémy Rosen --- This patch is here to avoid having to do an overlay for the most common cases (ipv4 with fixed IP or DHCP) This is reduced to the bare minimum to cover the most common case. Anything more complex can be done by using overlays instead. I have not added the option to (de)activate persistant naming when networkd is enabled because it logically belongs to the networkd package and not to the simple network configuration --- v3 : * rename the script to a more generic name * reorganized script to separate param verification from generation * quoted params properly to protect against faulty params * removed /etc/network/interfaces from skeleton * reorganized options in configuration menu * added networkd configuration support v2 : * moved to TARGET_FINALIZE * removed support for lo. It should always be on. * reworked default parameters --- support/scripts/generate-network-config.sh | 136 +++++++++++++++++++++++++++++ system/Config.in | 60 +++++++++++++ system/skeleton/etc/network/interfaces | 4 - system/system.mk | 5 ++ 4 files changed, 201 insertions(+), 4 deletions(-) create mode 100755 support/scripts/generate-network-config.sh delete mode 100644 system/skeleton/etc/network/interfaces diff --git a/support/scripts/generate-network-config.sh b/support/scripts/generate-network-config.sh new file mode 100755 index 0000000..c09d165 --- /dev/null +++ b/support/scripts/generate-network-config.sh @@ -0,0 +1,136 @@ +#!/bin/sh + +#extract our parameters from the config file +# see comment in support/scripts/mkusers at to why we can't simply source +for PARAM in \ + BR2_PACKAGE_SYSTEMD_NETWORKD \ + BR2_SIMPLE_NETWORK_NONE \ + BR2_SIMPLE_NETWORK_IPV4_DHCP \ + BR2_SIMPLE_NETWORK_IPV4_MANUAL \ + ; do +TMP=$(sed -r -e "/^$PARAM=(.*)$/!d;" -e 's//\1/;' $BR2_CONFIG) +export $PARAM=$TMP +done + +for PARAM in \ + BR2_SIMPLE_NETWORK_NAME \ + BR2_SIMPLE_NETWORK_IPV4_ADDRESS \ + BR2_SIMPLE_NETWORK_IPV4_NETMASK \ + BR2_SIMPLE_NETWORK_IPV4_BROADCAST \ + BR2_SIMPLE_NETWORK_IPV4_GATEWAY \ + ; do +TMP=$(sed -r -e "/^$PARAM=\"(.*)\"$/!d;" -e 's//\1/;' $BR2_CONFIG) +export $PARAM="$TMP" +done + +check_configuration () +{ + if [ -z "$BR2_SIMPLE_NETWORK_NONE" ] ; then + if [ -z "$BR2_SIMPLE_NETWORK_NAME" ] ; then + echo ERROR no name specified for first network interface + exit 1 + fi + if [ "$BR2_SIMPLE_NETWORK_IPV4_MANUAL" ] ; then + if [ -z "$BR2_SIMPLE_NETWORK_IPV4_ADDRESS" ] ; then + echo ERROR BR2_SIMPLE_NETWORK_IPV4_ADDRESS not set 1>&2 + exit 1 + fi + if [ -z "$BR2_SIMPLE_NETWORK_IPV4_NETMASK" ] ; then + echo ERROR BR2_SIMPLE_NETWORK_IPV4_NETMASK not set 1>&2 + exit 1 + fi + IFS=. + for dec in $BR2_SIMPLE_NETWORK_IPV4_NETMASK ; do + case $dec in + 255 | 254 | 252 |248 | 240 |224 | 192 | 128 | 0 );; + *) echo "Error: $BR2_SIMPLE_NETWORK_IPV4_NETMASK is not a correct NETMASK" 1>&2; exit 1 ;; + esac + done + fi + fi +} + +do_generate_interfaces () +{ + if [ "$BR2_PACKAGE_SYSTEMD_NETWORKD" ] ; then + echo + return + fi + echo "# interface file auto-generated by buildroot" + echo + echo "auto lo" + echo "iface lo inet loopback" + echo + + if [ -z "$BR2_SIMPLE_NETWORK_NONE" ] ; then + echo "auto $BR2_SIMPLE_NETWORK_NAME" + if [ "$BR2_SIMPLE_NETWORK_IPV4_DHCP" ] ; then + echo "iface $BR2_SIMPLE_NETWORK_NAME inet dhcp" + elif [ "$BR2_SIMPLE_NETWORK_IPV4_MANUAL" ] ; then + echo "iface $BR2_SIMPLE_NETWORK_NAME inet static" + echo " address $BR2_SIMPLE_NETWORK_IPV4_ADDRESS" + echo " netmask $BR2_SIMPLE_NETWORK_IPV4_NETMASK" + + if [ "$BR2_SIMPLE_NETWORK_IPV4_BROADCAST" ] ; then + echo " broadcast $BR2_SIMPLE_NETWORK_IPV4_BROADCAST" + fi + if [ "$BR2_SIMPLE_NETWORK_IPV4_GATEWAY" ] ; then + echo " gateway $BR2_SIMPLE_NETWORK_IPV4_GATEWAY" + fi + fi + fi +} + +do_generate_network_service () +{ + if [ "$BR2_SIMPLE_NETWORK_NONE" ] ; then + return + fi + echo "[Match]" + echo "Name=$BR2_SIMPLE_NETWORK_NAME" + echo + if [ $BR2_SIMPLE_NETWORK_IPV4_DHCP ] ; then + echo "[Network]" + echo "DHCP=v4" + elif [ $BR2_SIMPLE_NETWORK_IPV4_MANUAL ] ; then + nbits=0 + IFS=. + for dec in $BR2_SIMPLE_NETWORK_IPV4_NETMASK ; do + case $dec in + 255) let nbits+=8;; + 254) let nbits+=7;; + 252) let nbits+=6;; + 248) let nbits+=5;; + 240) let nbits+=4;; + 224) let nbits+=3;; + 192) let nbits+=2;; + 128) let nbits+=1;; + 0);; + esac + done + + if [ "$BR2_SIMPLE_NETWORK_IPV4_ADDRESS" != "0.0.0.0" ] ; then + if [ "$BR2_SIMPLE_NETWORK_IPV4_GATEWAY" ] ; then + echo "[Network]" + echo "Gateway=$BR2_SIMPLE_NETWORK_IPV4_GATEWAY" + echo "Description=buildroot-configured interface" + echo + fi + echo "[Address]" + echo "Address=$BR2_SIMPLE_NETWORK_IPV4_ADDRESS/$nbits" + if [ "$BR2_SIMPLE_NETWORK_IPV4_BROADCAST" ] ; then + echo "Broadcast=$BR2_SIMPLE_NETWORK_IPV4_BROADCAST" + fi + fi + fi +} + +check_configuration +mkdir -p $TARGET_DIR/etc/network/ +if [ "$BR2_PACKAGE_SYSTEMD_NETWORKD" ] ; then + echo > $TARGET_DIR/etc/network/interfaces + do_generate_network_service > $TARGET_DIR/etc/systemd/network/80-buildroot.network +else + do_generate_interfaces > $TARGET_DIR/etc/network/interfaces + echo > $TARGET_DIR/etc/systemd/network/80-buildroot.network +fi diff --git a/system/Config.in b/system/Config.in index 2465f79..3683edf 100644 --- a/system/Config.in +++ b/system/Config.in @@ -324,6 +324,66 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW endif # BR2_ROOTFS_SKELETON_DEFAULT +choice + prompt 'Simple network configuration' + default BR2_SIMPLE_NETWORK_NONE + help + buildroot will create a simple network configuration for a network + interface. This will generate the corresponding lines in + /etc/network/interfaces which is used by ifupdown. + + The simple network configuration only supports a single network + interface using a static or DHCP-allocated IPv4 address. If you + need something more complicate, create your own configuration file + in the BR2_ROOTFS_OVERLAY. + +config BR2_SIMPLE_NETWORK_NONE + bool "No configured network interface" + help + Do not configure the network interface, only configure the + loopback device + +config BR2_SIMPLE_NETWORK_IPV4_DHCP + bool "IPv4 with DHCP" + help + Use DHCP to configure this interface using the IPv4 protocol + +config BR2_SIMPLE_NETWORK_IPV4_MANUAL + bool "IPv4 with static IP address" + help + Configure IPv4 by specifying each parameter separately + +endchoice + +if !BR2_SIMPLE_NETWORK_NONE + +config BR2_SIMPLE_NETWORK_NAME + string "name of the physical network interface" + default "eth0" + help + The name used to recognise the network interface as reported + by the kernel + +if BR2_SIMPLE_NETWORK_IPV4_MANUAL +config BR2_SIMPLE_NETWORK_IPV4_ADDRESS + string "IP Address of the network interface" + default "0.0.0.0" + +config BR2_SIMPLE_NETWORK_IPV4_NETMASK + string "Netmask of the network interface" + default "255.255.255.255" + +config BR2_SIMPLE_NETWORK_IPV4_BROADCAST + string "Broadcast Address of the network interface" + +config BR2_SIMPLE_NETWORK_IPV4_GATEWAY + string "Address of the gateway for the network interface" + +endif # BR2_SIMPLE_NETWORK_IPV4_MANUAL + +endif # !BR2_SIMPLE_NETWORK_NONE + + config BR2_TARGET_TZ_INFO bool "Install timezone info" # No timezone for musl; only for uClibc or (e)glibc. diff --git a/system/skeleton/etc/network/interfaces b/system/skeleton/etc/network/interfaces deleted file mode 100644 index 218b82c..0000000 --- a/system/skeleton/etc/network/interfaces +++ /dev/null @@ -1,4 +0,0 @@ -# Configure Loopback -auto lo -iface lo inet loopback - diff --git a/system/system.mk b/system/system.mk index 5802e2d..8385c31 100644 --- a/system/system.mk +++ b/system/system.mk @@ -38,6 +38,11 @@ ifneq ($(TARGET_GENERIC_ROOT_PASSWD),) TARGETS += host-mkpasswd endif +define SIMPLE_NETWORK + $(TOPDIR)/support/scripts/generate-network-config.sh $(TARGET_DIR) +endef +TARGET_FINALIZE_HOOKS += SIMPLE_NETWORK + ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) define SYSTEM_ROOT_PASSWD