* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
@ 2014-10-17 19:10 André Erdmann
2014-10-17 22:40 ` Yann E. MORIN
2014-10-19 11:15 ` Thomas Petazzoni
0 siblings, 2 replies; 7+ messages in thread
From: André Erdmann @ 2014-10-17 19:10 UTC (permalink / raw)
To: buildroot
When using the buildroot-provided avahi-daemon.service file, bootup never
finishes, because multi-user.target is waiting for avahi-daemon to exit,
which is caused by "Type=oneshot" (in avahi-daemon.service).
Upstream's systemd files get already installed to /lib/systemd.
They're not an exact copy of S50avahi-daemon, but work flawlessly,
so use these units:
* avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
* avahi-daemon.socket,
not auto-enabled, but a dependency of avahi-daemon.service
* avahi-dnsconfd.service, auto-enabled
Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
---
With "Type=oneshot", systemd waits for avahi-daemon to exit,
which does not happen (unless killed):
$ systemctl --no-pager status avahi-daemon.service
* avahi-daemon.service - Avahi daemon
Loaded: loaded (/etc/systemd/system/avahi-daemon.service; enabled)
Active: activating (start) since Wed 2014-10-15 21:26:49 CEST; 56s ago
Main PID: 190 (avahi-daemon)
CGroup: /system.slice/avahi-daemon.service
|-190 avahi-daemon: running [buildroot.local]
|-192 avahi-daemon: chroot helper
Oct 15 21:26:49 buildroot avahi-daemon[190]: Network interface enumeration completed.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering HINFO record with values 'X86_64'/'LINUX'.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Server startup complete. Host name is buildroot.local. Local service c...3347.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/ssh.service) successfully established.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/sftp-ssh.service) successfully established.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Joining mDNS multicast group on interface br0.IPv4 with address 192.168.3.114.
Oct 15 21:26:49 buildroot avahi-daemon[190]: New relevant interface br0.IPv4 for mDNS.
Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering new address record for 192.168.3.114 on br0.IPv4.
Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::5054:ff:feb1:f19a on eth0.*.
Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::bcbb:86ff:fe4a:14d6 on br0.*.
Hint: Some lines were ellipsized, use -l to show in full.
(EOF)
The result is that the boot process never reaches "multi-user.target":
$ systemctl --no-pager list-jobs
JOB UNIT TYPE STATE
1 multi-user.target start waiting
57 avahi-daemon.service start running
2 jobs listed.
(EOF)
---
package/avahi/avahi-daemon.service | 15 ---------------
package/avahi/avahi.mk | 8 ++++----
2 files changed, 4 insertions(+), 19 deletions(-)
delete mode 100644 package/avahi/avahi-daemon.service
diff --git a/package/avahi/avahi-daemon.service b/package/avahi/avahi-daemon.service
deleted file mode 100644
index c9b7b1f..0000000
--- a/package/avahi/avahi-daemon.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Avahi daemon
-Requires=dbus.target
-After=syslog.target network.target auditd.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=ye
-ExecStart=/usr/sbin/avahi-daemon -s
-ExecReload=/usr/sbin/avahi-daemon -r
-ExecStop=/usr/sbin/avahi-daemon -k
-Restart=restart-always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 706561f..609d89c 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -164,14 +164,14 @@ endif
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
define AVAHI_INSTALL_INIT_SYSTEMD
- $(INSTALL) -D -m 644 package/avahi/avahi-daemon.service \
- $(TARGET_DIR)/etc/systemd/system/avahi-daemon.service
-
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
- ln -fs ../avahi-daemon.service \
+ ln -fs ../../../../lib/systemd/system/avahi-daemon.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service
+ ln -fs ../../../../lib/systemd/system/avahi-dnsconfd.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
+
mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d
$(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \
--
2.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-17 19:10 [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files André Erdmann
@ 2014-10-17 22:40 ` Yann E. MORIN
2014-10-18 11:39 ` Maxime Hadjinlian
2014-10-19 11:15 ` Thomas Petazzoni
1 sibling, 1 reply; 7+ messages in thread
From: Yann E. MORIN @ 2014-10-17 22:40 UTC (permalink / raw)
To: buildroot
Andr?, All,
On 2014-10-17 21:10 +0200, Andr? Erdmann spake thusly:
> When using the buildroot-provided avahi-daemon.service file, bootup never
> finishes, because multi-user.target is waiting for avahi-daemon to exit,
> which is caused by "Type=oneshot" (in avahi-daemon.service).
>
> Upstream's systemd files get already installed to /lib/systemd.
> They're not an exact copy of S50avahi-daemon, but work flawlessly,
> so use these units:
>
> * avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
> * avahi-daemon.socket,
> not auto-enabled, but a dependency of avahi-daemon.service
> * avahi-dnsconfd.service, auto-enabled
>
> Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
Looks like the sane thing to do, indeed.
I'm no systemd expert, so copying Eric, which will probably be able to
confirm my:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> With "Type=oneshot", systemd waits for avahi-daemon to exit,
> which does not happen (unless killed):
>
> $ systemctl --no-pager status avahi-daemon.service
> * avahi-daemon.service - Avahi daemon
> Loaded: loaded (/etc/systemd/system/avahi-daemon.service; enabled)
> Active: activating (start) since Wed 2014-10-15 21:26:49 CEST; 56s ago
> Main PID: 190 (avahi-daemon)
> CGroup: /system.slice/avahi-daemon.service
> |-190 avahi-daemon: running [buildroot.local]
> |-192 avahi-daemon: chroot helper
>
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Network interface enumeration completed.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering HINFO record with values 'X86_64'/'LINUX'.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Server startup complete. Host name is buildroot.local. Local service c...3347.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/ssh.service) successfully established.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/sftp-ssh.service) successfully established.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Joining mDNS multicast group on interface br0.IPv4 with address 192.168.3.114.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: New relevant interface br0.IPv4 for mDNS.
> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering new address record for 192.168.3.114 on br0.IPv4.
> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::5054:ff:feb1:f19a on eth0.*.
> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::bcbb:86ff:fe4a:14d6 on br0.*.
> Hint: Some lines were ellipsized, use -l to show in full.
> (EOF)
>
>
> The result is that the boot process never reaches "multi-user.target":
>
> $ systemctl --no-pager list-jobs
> JOB UNIT TYPE STATE
> 1 multi-user.target start waiting
> 57 avahi-daemon.service start running
>
> 2 jobs listed.
> (EOF)
> ---
> package/avahi/avahi-daemon.service | 15 ---------------
> package/avahi/avahi.mk | 8 ++++----
> 2 files changed, 4 insertions(+), 19 deletions(-)
> delete mode 100644 package/avahi/avahi-daemon.service
>
> diff --git a/package/avahi/avahi-daemon.service b/package/avahi/avahi-daemon.service
> deleted file mode 100644
> index c9b7b1f..0000000
> --- a/package/avahi/avahi-daemon.service
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -[Unit]
> -Description=Avahi daemon
> -Requires=dbus.target
> -After=syslog.target network.target auditd.service
> -
> -[Service]
> -Type=oneshot
> -RemainAfterExit=ye
> -ExecStart=/usr/sbin/avahi-daemon -s
> -ExecReload=/usr/sbin/avahi-daemon -r
> -ExecStop=/usr/sbin/avahi-daemon -k
> -Restart=restart-always
> -
> -[Install]
> -WantedBy=multi-user.target
> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> index 706561f..609d89c 100644
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -164,14 +164,14 @@ endif
> ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
>
> define AVAHI_INSTALL_INIT_SYSTEMD
> - $(INSTALL) -D -m 644 package/avahi/avahi-daemon.service \
> - $(TARGET_DIR)/etc/systemd/system/avahi-daemon.service
> -
> mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
>
> - ln -fs ../avahi-daemon.service \
> + ln -fs ../../../../lib/systemd/system/avahi-daemon.service \
> $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service
>
> + ln -fs ../../../../lib/systemd/system/avahi-dnsconfd.service \
> + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
> +
> mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d
>
> $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \
> --
> 2.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-17 22:40 ` Yann E. MORIN
@ 2014-10-18 11:39 ` Maxime Hadjinlian
2014-10-18 18:37 ` André Erdmann
0 siblings, 1 reply; 7+ messages in thread
From: Maxime Hadjinlian @ 2014-10-18 11:39 UTC (permalink / raw)
To: buildroot
Hi Yann, Andr?, all,
On Sat, Oct 18, 2014 at 12:40 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Andr?, All,
>
> On 2014-10-17 21:10 +0200, Andr? Erdmann spake thusly:
>> When using the buildroot-provided avahi-daemon.service file, bootup never
>> finishes, because multi-user.target is waiting for avahi-daemon to exit,
>> which is caused by "Type=oneshot" (in avahi-daemon.service).
>>
>> Upstream's systemd files get already installed to /lib/systemd.
>> They're not an exact copy of S50avahi-daemon, but work flawlessly,
>> so use these units:
>>
>> * avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
>> * avahi-daemon.socket,
>> not auto-enabled, but a dependency of avahi-daemon.service
>> * avahi-dnsconfd.service, auto-enabled
>>
>> Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
>
> Looks like the sane thing to do, indeed.
>
> I'm no systemd expert, so copying Eric, which will probably be able to
> confirm my:
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> With "Type=oneshot", systemd waits for avahi-daemon to exit,
>> which does not happen (unless killed):
>>
>> $ systemctl --no-pager status avahi-daemon.service
>> * avahi-daemon.service - Avahi daemon
>> Loaded: loaded (/etc/systemd/system/avahi-daemon.service; enabled)
>> Active: activating (start) since Wed 2014-10-15 21:26:49 CEST; 56s ago
>> Main PID: 190 (avahi-daemon)
>> CGroup: /system.slice/avahi-daemon.service
>> |-190 avahi-daemon: running [buildroot.local]
>> |-192 avahi-daemon: chroot helper
>>
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Network interface enumeration completed.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering HINFO record with values 'X86_64'/'LINUX'.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Server startup complete. Host name is buildroot.local. Local service c...3347.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/ssh.service) successfully established.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/sftp-ssh.service) successfully established.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Joining mDNS multicast group on interface br0.IPv4 with address 192.168.3.114.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: New relevant interface br0.IPv4 for mDNS.
>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering new address record for 192.168.3.114 on br0.IPv4.
>> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::5054:ff:feb1:f19a on eth0.*.
>> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::bcbb:86ff:fe4a:14d6 on br0.*.
>> Hint: Some lines were ellipsized, use -l to show in full.
>> (EOF)
>>
>>
>> The result is that the boot process never reaches "multi-user.target":
>>
>> $ systemctl --no-pager list-jobs
>> JOB UNIT TYPE STATE
>> 1 multi-user.target start waiting
>> 57 avahi-daemon.service start running
>>
>> 2 jobs listed.
>> (EOF)
>> ---
>> package/avahi/avahi-daemon.service | 15 ---------------
>> package/avahi/avahi.mk | 8 ++++----
>> 2 files changed, 4 insertions(+), 19 deletions(-)
>> delete mode 100644 package/avahi/avahi-daemon.service
>>
>> diff --git a/package/avahi/avahi-daemon.service b/package/avahi/avahi-daemon.service
>> deleted file mode 100644
>> index c9b7b1f..0000000
>> --- a/package/avahi/avahi-daemon.service
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -[Unit]
>> -Description=Avahi daemon
>> -Requires=dbus.target
>> -After=syslog.target network.target auditd.service
>> -
>> -[Service]
>> -Type=oneshot
>> -RemainAfterExit=ye
>> -ExecStart=/usr/sbin/avahi-daemon -s
>> -ExecReload=/usr/sbin/avahi-daemon -r
>> -ExecStop=/usr/sbin/avahi-daemon -k
>> -Restart=restart-always
>> -
>> -[Install]
>> -WantedBy=multi-user.target
>> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
>> index 706561f..609d89c 100644
>> --- a/package/avahi/avahi.mk
>> +++ b/package/avahi/avahi.mk
>> @@ -164,14 +164,14 @@ endif
>> ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
>>
>> define AVAHI_INSTALL_INIT_SYSTEMD
>> - $(INSTALL) -D -m 644 package/avahi/avahi-daemon.service \
>> - $(TARGET_DIR)/etc/systemd/system/avahi-daemon.service
>> -
>> mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
>>
>> - ln -fs ../avahi-daemon.service \
>> + ln -fs ../../../../lib/systemd/system/avahi-daemon.service \
Just an idea, how about doing:
ln -fs /lib/systemd/system/avahi-daemon.service \
Instead of all the ../ ?
>> $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service
>>
>> + ln -fs ../../../../lib/systemd/system/avahi-dnsconfd.service \
Same here.
>> + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
>> +
>> mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d
>>
>> $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \
>> --
>> 2.1.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-18 11:39 ` Maxime Hadjinlian
@ 2014-10-18 18:37 ` André Erdmann
0 siblings, 0 replies; 7+ messages in thread
From: André Erdmann @ 2014-10-18 18:37 UTC (permalink / raw)
To: buildroot
2014-10-18 13:39 GMT+02:00 Maxime Hadjinlian <maxime.hadjinlian@gmail.com>:
> Hi Yann, Andr?, all,
>
> On Sat, Oct 18, 2014 at 12:40 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> Andr?, All,
>>
>> On 2014-10-17 21:10 +0200, Andr? Erdmann spake thusly:
>>> When using the buildroot-provided avahi-daemon.service file, bootup never
>>> finishes, because multi-user.target is waiting for avahi-daemon to exit,
>>> which is caused by "Type=oneshot" (in avahi-daemon.service).
>>>
>>> Upstream's systemd files get already installed to /lib/systemd.
>>> They're not an exact copy of S50avahi-daemon, but work flawlessly,
>>> so use these units:
>>>
>>> * avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
>>> * avahi-daemon.socket,
>>> not auto-enabled, but a dependency of avahi-daemon.service
>>> * avahi-dnsconfd.service, auto-enabled
>>>
>>> Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
>>
>> Looks like the sane thing to do, indeed.
>>
>> I'm no systemd expert, so copying Eric, which will probably be able to
>> confirm my:
>>
>> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>
>> Regards,
>> Yann E. MORIN.
>>
>>> ---
>>> With "Type=oneshot", systemd waits for avahi-daemon to exit,
>>> which does not happen (unless killed):
>>>
>>> $ systemctl --no-pager status avahi-daemon.service
>>> * avahi-daemon.service - Avahi daemon
>>> Loaded: loaded (/etc/systemd/system/avahi-daemon.service; enabled)
>>> Active: activating (start) since Wed 2014-10-15 21:26:49 CEST; 56s ago
>>> Main PID: 190 (avahi-daemon)
>>> CGroup: /system.slice/avahi-daemon.service
>>> |-190 avahi-daemon: running [buildroot.local]
>>> |-192 avahi-daemon: chroot helper
>>>
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Network interface enumeration completed.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering HINFO record with values 'X86_64'/'LINUX'.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Server startup complete. Host name is buildroot.local. Local service c...3347.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/ssh.service) successfully established.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Service "buildroot" (/services/sftp-ssh.service) successfully established.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Joining mDNS multicast group on interface br0.IPv4 with address 192.168.3.114.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: New relevant interface br0.IPv4 for mDNS.
>>> Oct 15 21:26:49 buildroot avahi-daemon[190]: Registering new address record for 192.168.3.114 on br0.IPv4.
>>> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::5054:ff:feb1:f19a on eth0.*.
>>> Oct 15 21:26:50 buildroot avahi-daemon[190]: Registering new address record for fe80::bcbb:86ff:fe4a:14d6 on br0.*.
>>> Hint: Some lines were ellipsized, use -l to show in full.
>>> (EOF)
>>>
>>>
>>> The result is that the boot process never reaches "multi-user.target":
>>>
>>> $ systemctl --no-pager list-jobs
>>> JOB UNIT TYPE STATE
>>> 1 multi-user.target start waiting
>>> 57 avahi-daemon.service start running
>>>
>>> 2 jobs listed.
>>> (EOF)
>>> ---
>>> package/avahi/avahi-daemon.service | 15 ---------------
>>> package/avahi/avahi.mk | 8 ++++----
>>> 2 files changed, 4 insertions(+), 19 deletions(-)
>>> delete mode 100644 package/avahi/avahi-daemon.service
>>>
>>> diff --git a/package/avahi/avahi-daemon.service b/package/avahi/avahi-daemon.service
>>> deleted file mode 100644
>>> index c9b7b1f..0000000
>>> --- a/package/avahi/avahi-daemon.service
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -[Unit]
>>> -Description=Avahi daemon
>>> -Requires=dbus.target
>>> -After=syslog.target network.target auditd.service
>>> -
>>> -[Service]
>>> -Type=oneshot
>>> -RemainAfterExit=ye
>>> -ExecStart=/usr/sbin/avahi-daemon -s
>>> -ExecReload=/usr/sbin/avahi-daemon -r
>>> -ExecStop=/usr/sbin/avahi-daemon -k
>>> -Restart=restart-always
>>> -
>>> -[Install]
>>> -WantedBy=multi-user.target
>>> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
>>> index 706561f..609d89c 100644
>>> --- a/package/avahi/avahi.mk
>>> +++ b/package/avahi/avahi.mk
>>> @@ -164,14 +164,14 @@ endif
>>> ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
>>>
>>> define AVAHI_INSTALL_INIT_SYSTEMD
>>> - $(INSTALL) -D -m 644 package/avahi/avahi-daemon.service \
>>> - $(TARGET_DIR)/etc/systemd/system/avahi-daemon.service
>>> -
>>> mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
>>>
>>> - ln -fs ../avahi-daemon.service \
>>> + ln -fs ../../../../lib/systemd/system/avahi-daemon.service \
> Just an idea, how about doing:
> ln -fs /lib/systemd/system/avahi-daemon.service \
> Instead of all the ../ ?
+1, I simply had the impression that relative paths were preferred.
>>> $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service
>>>
>>> + ln -fs ../../../../lib/systemd/system/avahi-dnsconfd.service \
> Same here.
>>> + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
>>> +
>>> mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d
>>>
>>> $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \
>>> --
>>> 2.1.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-17 19:10 [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files André Erdmann
2014-10-17 22:40 ` Yann E. MORIN
@ 2014-10-19 11:15 ` Thomas Petazzoni
2014-10-19 11:22 ` Maxime Hadjinlian
1 sibling, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2014-10-19 11:15 UTC (permalink / raw)
To: buildroot
Dear Andr? Erdmann,
On Fri, 17 Oct 2014 21:10:42 +0200, Andr? Erdmann wrote:
> When using the buildroot-provided avahi-daemon.service file, bootup never
> finishes, because multi-user.target is waiting for avahi-daemon to exit,
> which is caused by "Type=oneshot" (in avahi-daemon.service).
>
> Upstream's systemd files get already installed to /lib/systemd.
> They're not an exact copy of S50avahi-daemon, but work flawlessly,
> so use these units:
>
> * avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
> * avahi-daemon.socket,
> not auto-enabled, but a dependency of avahi-daemon.service
> * avahi-dnsconfd.service, auto-enabled
>
> Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
Thanks, applied, after changing the symbolic links to use absolute
paths instead of relative paths.
Also, I pushed a number of followup commits:
3b4ec0c6a82fc853b00b2a720d0b945dcb2ea67e avahi: do not install S05avahi-setup.sh in systemd setup
6c947771424b139199fc56bb7fff47755a17c6a9 avahi: remove useless 'mkdir -p' in AVAHI_INSTALL_INIT_SYSTEMD
d2fd9ef86ee096784c9b326004ba928a16d035ae avahi: fix indentation in AVAHI_INSTALL_INIT_SYSTEMD
In the last commit (first in the list), I raise the following question:
Note: in a systemd configuration, there is no provision to do what
S05avahi-setup.sh is doing for sysv init configurations. Maybe this is
something that our systemd people should have a look at.
Someone to look into this?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-19 11:15 ` Thomas Petazzoni
@ 2014-10-19 11:22 ` Maxime Hadjinlian
2014-10-19 11:29 ` Thomas Petazzoni
0 siblings, 1 reply; 7+ messages in thread
From: Maxime Hadjinlian @ 2014-10-19 11:22 UTC (permalink / raw)
To: buildroot
Hi Thomas, all
On Sun, Oct 19, 2014 at 1:15 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Andr? Erdmann,
>
> On Fri, 17 Oct 2014 21:10:42 +0200, Andr? Erdmann wrote:
>> When using the buildroot-provided avahi-daemon.service file, bootup never
>> finishes, because multi-user.target is waiting for avahi-daemon to exit,
>> which is caused by "Type=oneshot" (in avahi-daemon.service).
>>
>> Upstream's systemd files get already installed to /lib/systemd.
>> They're not an exact copy of S50avahi-daemon, but work flawlessly,
>> so use these units:
>>
>> * avahi-daemon.service, auto-enabled (ln -fs in AVAHI_INSTALL_INIT_SYSTEMD)
>> * avahi-daemon.socket,
>> not auto-enabled, but a dependency of avahi-daemon.service
>> * avahi-dnsconfd.service, auto-enabled
>>
>> Signed-off-by: Andr? Erdmann <dywi@mailerd.de>
>
> Thanks, applied, after changing the symbolic links to use absolute
> paths instead of relative paths.
>
> Also, I pushed a number of followup commits:
>
> 3b4ec0c6a82fc853b00b2a720d0b945dcb2ea67e avahi: do not install S05avahi-setup.sh in systemd setup
> 6c947771424b139199fc56bb7fff47755a17c6a9 avahi: remove useless 'mkdir -p' in AVAHI_INSTALL_INIT_SYSTEMD
> d2fd9ef86ee096784c9b326004ba928a16d035ae avahi: fix indentation in AVAHI_INSTALL_INIT_SYSTEMD
>
> In the last commit (first in the list), I raise the following question:
>
> Note: in a systemd configuration, there is no provision to do what
> S05avahi-setup.sh is doing for sysv init configurations. Maybe this is
> something that our systemd people should have a look at.
>
> Someone to look into this?
It's already done, look at the avahi_tmpfiles.conf, it's made
explicitly for that.
Note that others daemon could benefit for it, like dropbear, I might
have some patch about that somewhere.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files
2014-10-19 11:22 ` Maxime Hadjinlian
@ 2014-10-19 11:29 ` Thomas Petazzoni
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2014-10-19 11:29 UTC (permalink / raw)
To: buildroot
Dear Maxime Hadjinlian,
On Sun, 19 Oct 2014 13:22:10 +0200, Maxime Hadjinlian wrote:
> > Someone to look into this?
> It's already done, look at the avahi_tmpfiles.conf, it's made
> explicitly for that.
Aaah, ok. Not easy to spot when you're not a systemd guy :)
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-10-19 11:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-17 19:10 [Buildroot] [PATCH 1/1] package/avahi: use upstream-provided systemd files André Erdmann
2014-10-17 22:40 ` Yann E. MORIN
2014-10-18 11:39 ` Maxime Hadjinlian
2014-10-18 18:37 ` André Erdmann
2014-10-19 11:15 ` Thomas Petazzoni
2014-10-19 11:22 ` Maxime Hadjinlian
2014-10-19 11:29 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox