From patchwork Wed Jun 19 16:09:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 14349 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9082F1710E; Wed, 19 Jun 2019 17:22:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8AB731710E for ; Wed, 19 Jun 2019 17:22:28 +0100 (BST) Received: from localhost ([::1]:40210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hddLv-0002Xx-K3 for patchwork@mira.cbaines.net; Wed, 19 Jun 2019 12:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55257) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdd9w-0003PO-Dt for guix-patches@gnu.org; Wed, 19 Jun 2019 12:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdd9u-000881-Jw for guix-patches@gnu.org; Wed, 19 Jun 2019 12:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33796) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdd9u-00087x-GJ for guix-patches@gnu.org; Wed, 19 Jun 2019 12:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hdd9u-00012N-Aa for guix-patches@gnu.org; Wed, 19 Jun 2019 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36294] [PATCH 2/3] Have NetworkManager create '/var/lib/misc' directory required by dnsmasq. References: <20190619160557.hkxkioufw2ybpgml@pelzflorian.localdomain> In-Reply-To: <20190619160557.hkxkioufw2ybpgml@pelzflorian.localdomain> Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2019 16:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36294@debbugs.gnu.org Received: via spool by 36294-submit@debbugs.gnu.org id=B36294.15609605443899 (code B ref 36294); Wed, 19 Jun 2019 16:10:02 +0000 Received: (at 36294) by debbugs.gnu.org; 19 Jun 2019 16:09:04 +0000 Received: from localhost ([127.0.0.1]:47337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdd8y-00010p-BL for submit@debbugs.gnu.org; Wed, 19 Jun 2019 12:09:04 -0400 Received: from pelzflorian.de ([5.45.111.108]:41660 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdd8v-00010Q-RO for 36294@debbugs.gnu.org; Wed, 19 Jun 2019 12:09:02 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 483D836007F for <36294@debbugs.gnu.org>; Wed, 19 Jun 2019 18:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1560960541; bh=IrvrA9G+FBRfCtt5+sQGOVXXXcRe0pa4eZd5zlIFbDo=; h=Date:From:To:Subject; b=UyoMboMqe+uff5qCj5VgtQjZSOsprhaH6mg6/KuQlsEnuWZYQT0YCzY1XKKlSkua5 b/xEJHDnUXJnx9pkGL8hJDh6aD9znnzi+3ZqJljmahKcdRtAbI1SQt7f+LWZxDyLgX 9DIwrO1+9dCQRjD25zE10+e5YhPh5PYUmUJHQ0vI= Date: Wed, 19 Jun 2019 18:09:01 +0200 From: Florian Pelz Message-ID: <20190619160900.tduqs73f7jkz3lkn@pelzflorian.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180716 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (%network-manager-activation): Rename to... (network-manager-activation): ... this and make it a procedure. Make it create '/var/lib/misc' when using dnsmasq. (network-manager-service-type): Use it. --- gnu/services/networking.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 73acb3b17f..13cffd9feb 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -895,11 +895,17 @@ and @command{wicd-curses} user interfaces." (vpn-plugins network-manager-vpn-plugins ;list of (default '()))) -(define %network-manager-activation - ;; Activation gexp for NetworkManager. - #~(begin - (use-modules (guix build utils)) - (mkdir-p "/etc/NetworkManager/system-connections"))) +(define network-manager-activation + ;; Activation gexp for NetworkManager + (match-lambda + (($ network-manager dns vpn-plugins) + #~(begin + (use-modules (guix build utils)) + (mkdir-p "/etc/NetworkManager/system-connections") + #$@(if (equal? dns "dnsmasq") + ;; create directory to store dnsmasq lease file + '((mkdir-p "/var/lib/misc")) + '()))))) (define (vpn-plugin-directory plugins) "Return a directory containing PLUGINS, the NM VPN plugins." @@ -949,7 +955,7 @@ and @command{wicd-curses} user interfaces." (service-extension dbus-root-service-type config->package) (service-extension polkit-service-type config->package) (service-extension activation-service-type - (const %network-manager-activation)) + network-manager-activation) (service-extension session-environment-service-type network-manager-environment) ;; Add network-manager to the system profile.