Skip to content

[pull] master from Azure:master #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Nov 27, 2019
Merged

[pull] master from Azure:master #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions files/build_templates/dhcp_relay.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=DHCP relay container
Requires=updategraph.service swss.service teamd.service
Requires=updategraph.service
After=updategraph.service swss.service syncd.service teamd.service
Before=ntp-config.service
StartLimitIntervalSec=1200
Expand All @@ -15,4 +15,4 @@ Restart=always
RestartSec=30

[Install]
WantedBy=multi-user.target swss.service teamd.service
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion files/scripts/swss.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SERVICE="swss"
PEER="syncd"
DEPENDENT="teamd radv"
DEPENDENT="teamd radv dhcp_relay"
DEBUGLOG="/tmp/swss-syncd-debug.log"
LOCKFILE="/tmp/swss-syncd-lock"

Expand Down