diff options
| author | Jeremy Kerr <jk@codeconstruct.com.au> | 2020-09-03 13:04:56 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-10-14 00:45:03 +0300 |
| commit | d8952bdf0d10c6bb2a9e884da59fae1d8063f26f (patch) | |
| tree | ad07893acbc6ceb67fed1b87f4ee65bbcba3160b /meta-phosphor/classes | |
| parent | fa9f2ad1ffd8993ad1253565b51938e9b2822f1a (diff) | |
| download | openbmc-d8952bdf0d10c6bb2a9e884da59fae1d8063f26f.tar.xz | |
obmc-phosphor-discovery-service: Include hostname in service names
Currently, we'll export avahi services solely under their service names.
With multiple BMCs on a network, this ends up with multiple
indistinguisable services exposed over avahi:
[jk@pecola ~]$ avahi-browse _obmc_console._tcp
+ br0 IPv6 obmc_console _obmc_console._tcp local
+ br0 IPv4 obmc_console _obmc_console._tcp local
+ br0 IPv4 obmc_console #2 _obmc_console._tcp local
+ br0 IPv6 obmc_console #2 _obmc_console._tcp local
This change uses the hostname as the identifier instead. There's no need
to include the service name, as that's what the service type field is
for.
(From meta-phosphor rev: d4e212eeed5832685839e24cf9ec4207ea3f32ae)
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Change-Id: I6b18b60c28cf4f2699693d41c2d52d56cd87a26a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass index e912beadc..fdade60f8 100644 --- a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass @@ -72,7 +72,8 @@ python discovery_services_postinstall() { fd.write('<?xml version="1.0" ?>\n') fd.write('<!DOCTYPE service-group SYSTEM "avahi-service.dtd">\n') fd.write('<service-group>\n') - fd.write(' <name>%s</name>\n' % service_name) + fd.write(' <name replace-wildcards="yes">%s on %%h</name>\n' + % service_name) fd.write(' <service>\n') fd.write(' <type>%s</type>\n' % service_type) fd.write(' <port>%s</port>\n' % service_port) |