Skip to content

Conversation

Saviq
Copy link
Collaborator

@Saviq Saviq commented Apr 7, 2020

Otherwise it may try (and fail) to read /etc/dnsmasq.conf, when it exists, and die.


To test:

$ sudo touch /etc/dnsmasq.conf
$ snap restart multipass
$ systemctl status snap.multipass.multipassd.service
# ensure dnsmasq is running under CGroup
$ sudo rm /etc/dnsmasq.conf

@Saviq Saviq requested a review from townsend2010 April 7, 2020 13:31
Otherwise it may try (and fail) to read /etc/dnsmasq.conf, when it exists, and die.
@multipass-ci-bot
Copy link
Collaborator

multipass-ci-bot commented Apr 7, 2020

macOS build available: multipass-1.2.0-dev.141.pr1471+g0dc0ffb9.mac-Darwin.pkg
Snap build available: snap refresh multipass --channel edge/pr1471

@codecov
Copy link

codecov bot commented Apr 7, 2020

Codecov Report

Merging #1471 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1471      +/-   ##
==========================================
+ Coverage   73.58%   73.59%   +0.01%     
==========================================
  Files         210      210              
  Lines        7616     7620       +4     
==========================================
+ Hits         5604     5608       +4     
  Misses       2012     2012              
Impacted Files Coverage Δ
src/platform/backends/qemu/dnsmasq_process_spec.h 100.00% <ø> (ø)
...rc/platform/backends/qemu/dnsmasq_process_spec.cpp 93.93% <100.00%> (+0.39%) ⬆️
src/platform/backends/qemu/dnsmasq_server.cpp 92.53% <100.00%> (+0.22%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9148960...558dd78. Read the comment docs.

Copy link
Contributor

@townsend2010 townsend2010 left a comment

Choose a reason for hiding this comment

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

Tried edge version of multipass with /etc/dnsmasq.conf in place and verified dnsmasq will not start. Then refreshed to this PR's version and verified dnsmasq is indeed running.

+1

bors r+

@Saviq Saviq linked an issue Apr 7, 2020 that may be closed by this pull request
@bors
Copy link
Contributor

bors bot commented Apr 7, 2020

Build succeeded

@bors bors bot merged commit e8433ce into master Apr 7, 2020
@bors bors bot deleted the dnsmasq-no-etc branch April 7, 2020 14:55
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.

/etc/dnsmasq.conf is read and fails due to confinement if it exists
3 participants