From patchwork Fri Mar 3 18:24:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 54 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id KdTXNee0uVjzJAAAtiB/HQ for ; Fri, 03 Mar 2017 19:24:39 +0100 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id C879540924; Fri, 3 Mar 2017 19:24:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Fri, 3 Mar 2017 19:24:38 +0100 (CET) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7D3812CCC0; Fri, 3 Mar 2017 18:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1488565478; bh=qX77fV5PldrO9w1Cqzvo+VnX/c8+FXtFrV3wysF97Qw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=kxQCDU5xxTm/db2lcFcDz/bSq8R/eeOtiHgKP6TfGlC5qBGX/yf2e4h4GDSzLCWit x4gJv/rbno/CjVKolOXrc4/fL+EaowoojQ3TygYdoIHlvl7Fb2xfJPo7iz/UPTjONw 04R6J0Ax/lyNEtA1IyCTWGQw2V1ByPF8ntsBM5mTiyE8Snd+0IqkEi83yaWy2WRYNB laFsh4IOZ0D6if6W94W0CFEONbozkBBHNLvN65cMTEAq5yNPP4ITM4xuD3PfDlNbzU w8J8nG3e0TXJiEmSZJLZ+bP/QP0l2d3Si/UIP51Pyu/1VslUwvIX9rWrNxreAy8zhN E5fTyq2HvFMPe2ER3FkK7fJR9kIvJ/UUfyLIvgyrpnTEKfKbCEhfcPvBosDUnlSQ6H eGLQnYiCONNNf3vkHugbMfjh9nz5bfcZUu7DyiOFlMnHHB7PMrfHuSSBpLUpiqRnwQ Q7Ji1ptaDYeLd9dAWS8aSs7WWI0sqy9Ybwavv55+aq79wHR3BaPMT4+sv6wnj2x/Oe RnNBjFb4+ffFJ4DZ0epPaGclMnQwkMlk42f8EU+GcMMpOLHsn2FR1QJkEIugl1vFrc hxhXLAShvfXZcemJfhixR64CnTd+D2rVPy7qtWUlkhpcrXXrNl1Of1h+hGzNbLlxWA riBiiYztCSEuECQXi8L6HmZc= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 3AEC62CCBD for ; Fri, 3 Mar 2017 18:24:35 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [IPv6:2a00:1828:2000:547::2]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 3 Mar 2017 18:24:35 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id A121A40918 for ; Fri, 3 Mar 2017 19:24:33 +0100 (CET) Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Fri, 3 Mar 2017 19:24:33 +0100 (CET) Received: by mail-wm0-x242.google.com with SMTP id v190so4376665wme.3 for ; Fri, 03 Mar 2017 10:24:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=BB660sD5Xd6fBZNt5+6nc9/0hPN8nuQIHg5OeQg/sD8=; b=eHXvPledixikZ+w2+0S59lsE87nUzmqiSKixF65bKAIdxoqk8ioPjy1OqcHt+hvmj5 DlA8GCSnRyUr80amw1axbb6/3f3EUOga27Aqpc4UIhCbYQQiR2agnxU/QhC3XjLleUwE /qwF8EPwddA7oyKnqdBIrGk0Z4XvnhgRaZm3LrKf0/5LPKoVR+AzhjVD/BL74ubkRSwp YOElzGD6g6xYBs2+C1meIh2GG5UubVLVZDFOog8koVNkoXV628odNXnjSzgRIBekgQXB SnsexbSC5HTCmZ1kRx2F4l5oqAjivb5lf+zMQ3YjZPm+dt7b1Y52/BGhPOshcm/KNd5B PIPg== X-Gm-Message-State: AMke39ksJ2eAt/SZlpv6H4mG0Mxzx9qtve89IE13lWJQDJV2ezTeUlLLUDag+Sx6eGVc0Q== X-Received: by 10.28.109.147 with SMTP id b19mr4353696wmi.69.1488565472670; Fri, 03 Mar 2017 10:24:32 -0800 (PST) Received: from Mindship-03 (ip5653397a.direct-adsl.nl. [86.83.57.122]) by smtp.gmail.com with ESMTPSA id j74sm1072935wrj.21.2017.03.03.10.24.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 10:24:32 -0800 (PST) Date: Fri, 3 Mar 2017 19:24:27 +0100 To: arch-projects@archlinux.org Message-ID: <20170303182411.GA5486@Mindship-03> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) Subject: [arch-projects] [netctl][PATCH 2/3] Move from /usr/lib/network to /usr/lib/netctl X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Jouke Witteveen via arch-projects Reply-To: Arch Linux projects development discussion Cc: Jouke Witteveen Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" X-UID: 127 Status: X-Keywords: Content-Length: 7663 --- Makefile | 10 +++++----- services/netctl-wait-online.service | 2 +- services/netctl@.service | 4 ++-- src/ifplugd.action | 2 +- src/lib/auto.action | 2 +- src/lib/connections/README | 8 ++++---- src/lib/dhcp/README | 8 ++++---- src/lib/globals | 4 ++-- src/lib/ip | 2 +- src/lib/network | 2 +- src/lib/rfkill | 2 +- src/lib/wpa | 2 +- src/netctl-auto | 2 +- src/netctl.in | 2 +- src/wifi-menu | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 157ecfd..e9f7fa8 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,11 @@ install: install -d $(DESTDIR)/etc/netctl/{examples,hooks,interfaces} install -m644 docs/examples/* $(DESTDIR)/etc/netctl/examples/ # Libs - install -d $(DESTDIR)/usr/lib/network/{connections,dhcp} - install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/network/ - install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/network/connections/ - install -m644 src/lib/dhcp/* $(DESTDIR)/usr/lib/network/dhcp/ - install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/ + install -d $(DESTDIR)/usr/lib/netctl/{connections,dhcp} + install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/netctl/ + install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/netctl/connections/ + install -m644 src/lib/dhcp/* $(DESTDIR)/usr/lib/netctl/dhcp/ + install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/netctl/ # Scripts install -d $(DESTDIR)/usr/bin sed -e "s|@systemdsystemconfdir@|$(systemdsystemconfdir)|g" \ diff --git a/services/netctl-wait-online.service b/services/netctl-wait-online.service index 64ca06d..86329aa 100644 --- a/services/netctl-wait-online.service +++ b/services/netctl-wait-online.service @@ -7,7 +7,7 @@ Before=network-online.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/lib/network/network wait-online +ExecStart=/usr/lib/netctl/network wait-online [Install] WantedBy=network-online.target diff --git a/services/netctl@.service b/services/netctl@.service index 3bb4129..77415d8 100644 --- a/services/netctl@.service +++ b/services/netctl@.service @@ -9,5 +9,5 @@ Wants=network.target Type=notify NotifyAccess=exec RemainAfterExit=yes -ExecStart=/usr/lib/network/network start %I -ExecStop=/usr/lib/network/network stop %I +ExecStart=/usr/lib/netctl/network start %I +ExecStop=/usr/lib/netctl/network stop %I diff --git a/src/ifplugd.action b/src/ifplugd.action index a1c8dee..fa0321e 100755 --- a/src/ifplugd.action +++ b/src/ifplugd.action @@ -2,7 +2,7 @@ # # ifplugd.action script for netctl -. /usr/lib/network/globals +. /usr/lib/netctl/globals PROFILE_FILE="$STATE_DIR/ifplugd-$1.profile" diff --git a/src/lib/auto.action b/src/lib/auto.action index 5b770c2..66d13b0 100755 --- a/src/lib/auto.action +++ b/src/lib/auto.action @@ -1,6 +1,6 @@ #! /bin/bash -. /usr/lib/network/globals +. /usr/lib/netctl/globals . "$SUBR_DIR/ip" export INTERFACE="$1" diff --git a/src/lib/connections/README b/src/lib/connections/README index 2dd4b7b..10282fe 100644 --- a/src/lib/connections/README +++ b/src/lib/connections/README @@ -1,11 +1,11 @@ Support for connection types is implemented by connection files in - /usr/lib/network/connections/ + /usr/lib/netctl/connections/ The file name determines the name of the connection type, so support for the aviancarrier connection type will be provided by the file: - /usr/lib/network/connections/aviancarrier + /usr/lib/netctl/connections/aviancarrier Files that implement support for a connection type should NOT be executable. Such files should contain valid Bash code, among which two @@ -20,8 +20,8 @@ respectively. When the functions are called, three bash files are already sourced, so all functions and variables in those files are available. The readily sourced files are: - /usr/lib/network/network - /usr/lib/network/globals + /usr/lib/netctl/network + /usr/lib/netctl/globals /etc/netctl/ Here, is the profile file specifying the desired network diff --git a/src/lib/dhcp/README b/src/lib/dhcp/README index df17d5a..87a0669 100644 --- a/src/lib/dhcp/README +++ b/src/lib/dhcp/README @@ -1,11 +1,11 @@ Support for dhcp clients is implemented by files in - /usr/lib/network/dhcp/ + /usr/lib/netctl/dhcp/ The file name determines the name of the client for the profile, so support for a client named dhcpcd is provided by the file: - /usr/lib/network/dhcp/dhcpcd + /usr/lib/netctl/dhcp/dhcpcd Files that implement support for a connection type should NOT be executable. Such files should contain valid Bash code, among which two @@ -20,8 +20,8 @@ client. When the functions are called, three bash files are already sourced, so all functions and variables in those files are available. The readily sourced files are: - /usr/lib/network/network - /usr/lib/network/globals + /usr/lib/netctl/network + /usr/lib/netctl/globals /etc/netctl/ Here, is the profile file specifying the desired network diff --git a/src/lib/globals b/src/lib/globals index f4e64a3..ac3ae66 100644 --- a/src/lib/globals +++ b/src/lib/globals @@ -1,7 +1,7 @@ NETCTL_VERSION="notpackaged" PROFILE_DIR="/etc/netctl" -SUBR_DIR="/usr/lib/network" -STATE_DIR="/run/network" +SUBR_DIR="/usr/lib/netctl" +STATE_DIR="/run/netctl" STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}" diff --git a/src/lib/ip b/src/lib/ip index 71c7fa2..47253e4 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -1,4 +1,4 @@ -## /usr/lib/network/globals needs to be sourced before this file +## /usr/lib/netctl/globals needs to be sourced before this file ## Interface a DHCP client diff --git a/src/lib/network b/src/lib/network index 81a4234..e068bc8 100755 --- a/src/lib/network +++ b/src/lib/network @@ -1,6 +1,6 @@ #! /bin/bash -. /usr/lib/network/globals +. /usr/lib/netctl/globals ## Check if a string represents a network interface diff --git a/src/lib/rfkill b/src/lib/rfkill index 05c1382..959ff28 100644 --- a/src/lib/rfkill +++ b/src/lib/rfkill @@ -1,4 +1,4 @@ -## /usr/lib/network/globals needs to be sourced before this file +## /usr/lib/netctl/globals needs to be sourced before this file ## Determine the system interface of an rfkill device diff --git a/src/lib/wpa b/src/lib/wpa index e7d873d..b696229 100644 --- a/src/lib/wpa +++ b/src/lib/wpa @@ -1,4 +1,4 @@ -## /usr/lib/network/globals needs to be sourced before this file +## /usr/lib/netctl/globals needs to be sourced before this file ## Wrapper around wpa_cli to deal with supplicant configurations that set a diff --git a/src/netctl-auto b/src/netctl-auto index f78efe3..ff017b0 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -1,7 +1,7 @@ #! /bin/bash # Contributed by: Sebastian Wicki -. /usr/lib/network/globals +. /usr/lib/netctl/globals . "$SUBR_DIR/wpa" . "$SUBR_DIR/rfkill" diff --git a/src/netctl.in b/src/netctl.in index 37c095c..f5c5459 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -1,6 +1,6 @@ #! /bin/bash -. /usr/lib/network/globals +. /usr/lib/netctl/globals usage() { diff --git a/src/wifi-menu b/src/wifi-menu index c13c35b..bafefc4 100755 --- a/src/wifi-menu +++ b/src/wifi-menu @@ -1,6 +1,6 @@ #! /bin/bash -. /usr/lib/network/globals +. /usr/lib/netctl/globals . "$SUBR_DIR/wpa" . "$SUBR_DIR/rfkill"