Skip to content
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.

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

Option Static routes support - RFC 3442 #43

Closed
wants to merge 1 commit into from
Closed

Option Static routes support - RFC 3442 #43

wants to merge 1 commit into from

Conversation

davidblaisonneau-orange
Copy link
Contributor

@@ -34,6 +34,11 @@ option fqdn.no-client-update on; # set the "O" and "S" flag bits
option fqdn.rcode2 255;
option pxegrub code 150 = text ;

<% if has_variable?( 'option_static_route' ) -%>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you also need a check if it's non-empty.

@ekohl
Copy link
Member

ekohl commented Apr 10, 2015

Would you mind adding a test case as well? And the tests need to pass. Otherwise I think it's a good addition.

@davidblaisonneau-orange
Copy link
Contributor Author

Travis seems to be happy :) I hope the tests are ok for you.

@ekohl
Copy link
Member

ekohl commented Apr 27, 2015

👍
@domcleal / @mmoll?

@mmoll
Copy link
Contributor

mmoll commented Apr 27, 2015

I don't use the -dhcp module, so I can't say too much content-wise, but the tests look OK, so 👍

@davidblaisonneau-orange could you squash your commits together into one?

@mmoll
Copy link
Contributor

mmoll commented May 2, 2015

@davidblaisonneau-orange there are still 8 commits. git rebase -i HEAD~8 and the usual squash/fixup dance should do the trick, followed by a force push into the master branch of your fork.

@ekohl
Copy link
Member

ekohl commented May 2, 2015

BTW, I don't mind squashing it and pushing the squashed commit if you can't figure it out.

@davidblaisonneau-orange
Copy link
Contributor Author

This should be better. Sorry for the delay, PR is something quite new for me

@ekohl
Copy link
Member

ekohl commented May 4, 2015

@davidblaisonneau-orange no problem, we've all been there. The only thing that would finish it if you could fix the commit message to something more meaningful.

@davidblaisonneau-orange
Copy link
Contributor Author

Now it should be fine :)

@ekohl
Copy link
Member

ekohl commented May 4, 2015

👍

@@ -16,6 +16,12 @@ subnet <%= @network %> netmask <%= @mask %> {
<% if @gateway && !@gateway.strip.empty? -%>
option routers <%= @gateway %>;
<% end -%>
<% if @static_routes
@static_routes.each do |static_route| -%>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please use

<% if @static_routes -%>
<%   @static_routes.each do |static_route| -%>
...
<%   end -%>
<% end -%>

or similar here? I was just confused by seeing two <% end -%>s and thought of a duplicate line.

@mmoll
Copy link
Contributor

mmoll commented May 4, 2015

👍 after fixing the minor whitespace nit.

@davidblaisonneau-orange
Copy link
Contributor Author

Done

@mmoll
Copy link
Contributor

mmoll commented May 5, 2015

👍

@ekohl ekohl closed this in c22f464 May 6, 2015
@ekohl
Copy link
Member

ekohl commented May 6, 2015

Thanks!

@davidblaisonneau-orange
Copy link
Contributor Author

Thanks to you !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants