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

Always process DNS and DHCP settings in installer #1630

Merged
merged 5 commits into from Jul 26, 2017

Conversation

Projects
None yet
3 participants
@Mcat12
Copy link
Member

Mcat12 commented Jul 23, 2017

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


Fixes issue reported on Discourse and possibly unreported issues.

This template was created based on the work of udemy-dl.

@Mcat12 Mcat12 added the Bug: fixed label Jul 23, 2017

@PromoFaux PromoFaux force-pushed the fix/always-process-dns-dhcp branch 3 times, most recently from da50168 to 344b227 Jul 26, 2017

@PromoFaux PromoFaux changed the title Always process DNS and DHCP settings in installer Fix development branch. Jul 26, 2017

@PromoFaux PromoFaux changed the title Fix development branch. Always process DHCP and DNS Jul 26, 2017

@PromoFaux PromoFaux changed the title Always process DHCP and DNS Always process DNS and DHCP settings in installer Jul 26, 2017

@PromoFaux PromoFaux force-pushed the fix/always-process-dns-dhcp branch from 38f959a to dba94b6 Jul 26, 2017

Mcat12 added some commits Jul 26, 2017

Make sure dnsmasq config exists before modifying it
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Make sure the dnsmasq config directory exists
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Only remove the DHCP config if it exists (fixes tests, hopefully)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
@Mcat12

This comment has been minimized.

Copy link
Member Author

Mcat12 commented Jul 26, 2017

🎉 The tests pass

@PromoFaux

This comment has been minimized.

Copy link
Member

PromoFaux commented Jul 26, 2017

@Mcat12 Sorry, Merge conflicts now!

@PromoFaux

This comment has been minimized.

Copy link
Member

PromoFaux commented Jul 26, 2017

Approved
🎈

Approved with PullApprove

@PromoFaux PromoFaux merged commit b09c660 into development Jul 26, 2017

5 checks passed

codacy/pr Good work! A positive pull request.
Details
code-review/pullapprove Approved by Mcat12, PromoFaux
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@PromoFaux PromoFaux deleted the fix/always-process-dns-dhcp branch Jul 26, 2017

@dschaper dschaper removed the Merge Conflict label May 3, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.