From patchwork Tue Dec 27 22:24:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBHw7Nybnk=?= X-Patchwork-Id: 133368 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7A037B6FEF for ; Wed, 28 Dec 2011 09:24:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id BA5DB9C1A9; Tue, 27 Dec 2011 17:24:03 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XKQ46CiE3BHK; Tue, 27 Dec 2011 17:24:03 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 79E349C1A1; Tue, 27 Dec 2011 17:23:58 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 35DC79C1A0 for ; Tue, 27 Dec 2011 17:23:57 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z2dXviaF9xUA for ; Tue, 27 Dec 2011 17:23:52 -0500 (EST) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id BCE689C1A1 for ; Tue, 27 Dec 2011 17:23:52 -0500 (EST) Received: from pomiocik.lan (178-37-171-191.adsl.inetia.pl [178.37.171.191]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 25D881B405B; Tue, 27 Dec 2011 22:23:50 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: hostap@lists.shmoo.com Subject: [PATCH wpa_supplicant] Use correct (multi-user) target when installing systemd units. Date: Tue, 27 Dec 2011 23:24:46 +0100 Message-Id: <1325024686-7714-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.7.8.1.362.g5d6df.dirty X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com The 'network.target' is special (per systemd.special(7)), and is to be brought up indirectly when network is actually configured (i.e. through DHCP or static address settings). Irrelevant of that, all services should be always installed in multi-user.target. Fixes: http://w1.fi/bugz/show_bug.cgi?id=427 --- .../systemd/wpa_supplicant-nl80211@.service.in | 2 +- .../systemd/wpa_supplicant-wired@.service.in | 2 +- wpa_supplicant/systemd/wpa_supplicant.service.in | 2 +- wpa_supplicant/systemd/wpa_supplicant@.service.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in index 4d9c146..76aba12 100644 --- a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in +++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in @@ -10,4 +10,4 @@ Type=simple ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I [Install] -Alias=network.target.wants/wpa_supplicant-nl80211@wlan0.service +Alias=multi-user.target.wants/wpa_supplicant-nl80211@wlan0.service diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in index f2e7f11..ff384ae 100644 --- a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in +++ b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in @@ -10,4 +10,4 @@ Type=simple ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I [Install] -Alias=network.target.wants/wpa_supplicant-wired@wlan0.service +Alias=multi-user.target.wants/wpa_supplicant-wired@wlan0.service diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in index 5b947ac..4351ad8 100644 --- a/wpa_supplicant/systemd/wpa_supplicant.service.in +++ b/wpa_supplicant/systemd/wpa_supplicant.service.in @@ -7,5 +7,5 @@ BusName=fi.epitest.hostap.WPASupplicant ExecStart=@BINDIR@/wpa_supplicant -u [Install] -WantedBy=network.target +WantedBy=multi-user.target Alias=dbus-fi.epitest.hostap.WPASupplicant.service diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service.in b/wpa_supplicant/systemd/wpa_supplicant@.service.in index 0340b4d..c215567 100644 --- a/wpa_supplicant/systemd/wpa_supplicant@.service.in +++ b/wpa_supplicant/systemd/wpa_supplicant@.service.in @@ -10,4 +10,4 @@ Type=simple ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I [Install] -Alias=network.target.wants/wpa_supplicant@wlan0.service +Alias=multi-user.target.wants/wpa_supplicant@wlan0.service