Skip to content

Commit

Permalink
Delay starting zone-network-service until in.ndpd is online (oxidecom…
Browse files Browse the repository at this point in the history
…puter#6982)

There is a race condition between being able to configure an
addrconf address on an interface, and the NDP daemon starting up.
If they start in parallel, there is a chance that configuring
network interfaces will fail resulting in a broken zone. There
is a fix to implement better handling of the conflict in stlouis
but we should also just wait for the NDP service to come up before
attempting to configure interfaces.

Fixes oxidecomputer#6947 (along with
[stlouis#650](oxidecomputer/stlouis#650))
  • Loading branch information
citrus-it authored Nov 8, 2024
1 parent 5660966 commit cf8e9ac
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions smf/zone-network-setup/manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<service_fmri value='svc:/milestone/network:default' />
</dependency>

<!-- Run after the NDP daemon is online.. -->
<dependency name='ndp' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/network/routing/ndp:default' />
</dependency>

<!-- The zone-setup binary is not ready to run until its initial properties
have been set by the sled-agent, which happens after the
`manifest-import` service is running.
Expand Down

0 comments on commit cf8e9ac

Please sign in to comment.