This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 43bdff8136ea385ae6e5423d2b4c5b3ea2afedde (commit) via ccdd7d5a0b21f373e657dc4bbbb64cf5ffec3cfa (commit) from 4cf1d18fbb8a7cc118c084e5eb27f19107461830 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 43bdff8136ea385ae6e5423d2b4c5b3ea2afedde Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 27 12:18:22 2012 +0000

dhcp: Update the systemd unit file for dhclient.

This update enables dhclient to be properly used with the current networking code.

commit ccdd7d5a0b21f373e657dc4bbbb64cf5ffec3cfa Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 27 12:16:16 2012 +0000

hostapd: Make systemd unit file independent from network.service.

Within the startup of network.service, hostapd needs to be started which will cause a deadlock. This patch removes the requirement of hostapd, that the network service has already to be up.

-----------------------------------------------------------------------

Summary of changes: dhcp/dhcp.nm | 2 +- dhcp/systemd/dhclient4@.service | 21 +++++++++++++++++++++ dhcp/systemd/dhclient@.service | 17 ----------------- hostapd/hostapd.nm | 3 +-- hostapd/systemd/hostapd@.service | 3 +-- 5 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 dhcp/systemd/dhclient4@.service delete mode 100644 dhcp/systemd/dhclient@.service

Difference in files: diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index 246ad17..f9667b2 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -5,7 +5,7 @@

name = dhcp version = 4.2.2 -release = 2 +release = 3

groups = Networking/Daemons url = http://isc.org/products/DHCP/ diff --git a/dhcp/systemd/dhclient4@.service b/dhcp/systemd/dhclient4@.service new file mode 100644 index 0000000..d7023c8 --- /dev/null +++ b/dhcp/systemd/dhclient4@.service @@ -0,0 +1,21 @@ +[Unit] +Description=DHCP client daemon for IPv4 on %I +BindTo=dev-%I.device +After=dev-%I.device + +[Service] +Restart=on-failure +ExecStartPre=/usr/lib/network/dhclient-helper start %I ipv4 +ExecStart=/usr/sbin/dhclient -d %I -4 \ + -cf /run/network/dhclient/%I/dhclient4.conf \ + -lf /var/lib/dhclient/dhclient-%I.leases \ + -pf /run/network/dhclient/%I/dhclient4.pid +ExecStop=/usr/lib/network/dhclient-helper stop %I ipv4 + +# This could be used if you want to release a lease. +#ExecStop=/usr/sbin/dhclient -d -r %I -4 \ +# -cf /run/network/dhclient/%I/dhclient4.conf \ +# -lf /var/lib/dhclient/dhclient-%I.leases \ +# -pf /run/network/dhclient/%I/dhclient4.pid + +UtmpIdentifier=%I diff --git a/dhcp/systemd/dhclient@.service b/dhcp/systemd/dhclient@.service deleted file mode 100644 index c3afc93..0000000 --- a/dhcp/systemd/dhclient@.service +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=dhclient on %I -BindTo=dev-%I.device -After=dev-%I.device network.service -Requires=network.service - -[Service] -ExecStart=/usr/sbin/dhclient %I -UtmpIdentifier=%I -KillMode=process diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index 507c0ea..a5de902 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -5,7 +5,7 @@

name = hostapd version = 0.7.3 -release = 1 +release = 2

groups = Networking/Tools url = http://hostap.epitest.fi/hostapd/ @@ -46,7 +46,6 @@ end

packages package %{name} - end

package %{name}-debuginfo template DEBUGINFO diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service index 2cff6d9..748cb0e 100644 --- a/hostapd/systemd/hostapd@.service +++ b/hostapd/systemd/hostapd@.service @@ -8,8 +8,7 @@ [Unit] Description=WLAN AP on %I BindTo=dev-%I.device -After=dev-%I.device network.service -Requires=network.service +After=dev-%I.device

[Service] ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config

hooks/post-receive -- IPFire 3.x development tree