Skip to content

base: cvd: allocd: Search /usr/sbin for dnsmasq and fix PID file path - #3097

Queued
grandpaul wants to merge 1 commit into
google:mainfrom
grandpaul:paulliu-fix-dnsmasq
Queued

base: cvd: allocd: Search /usr/sbin for dnsmasq and fix PID file path#3097
grandpaul wants to merge 1 commit into
google:mainfrom
grandpaul:paulliu-fix-dnsmasq

Conversation

@grandpaul

Copy link
Copy Markdown
Collaborator

In Debian, dnsmasq is located in /usr/sbin/dnsmasq which is not typically in non-root users' $PATH. Add SearchForDnsmasq and DnsmasqPath fallback helpers similar to IptablesPath. Also fix StopDnsmasq to use CvdDir() instead of hardcoded /var/run/ and fix inverted file.is_open() logic.

@grandpaul
grandpaul force-pushed the paulliu-fix-dnsmasq branch from b891e63 to 1fbf032 Compare August 25, 2026 23:38
In Debian, dnsmasq is located in /usr/sbin/dnsmasq which is not typically
in non-root users' $PATH. Add SearchForDnsmasq and DnsmasqPath fallback
helpers similar to IptablesPath. Also fix StopDnsmasq to use CvdDir()
instead of hardcoded /var/run/ and fix inverted file.is_open() logic.

Signed-off-by: Ying-Chun Liu (PaulLiu) <liupa@google.com>
@grandpaul
grandpaul force-pushed the paulliu-fix-dnsmasq branch from 1fbf032 to ff6c1e1 Compare August 26, 2026 00:10
@grandpaul grandpaul added the kokoro:run Run e2e tests. label Aug 26, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Aug 26, 2026
@rmuthiah
rmuthiah requested review from Databean and dxapd August 26, 2026 15:01

@dxapd dxapd left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

great find, thank you!!

@grandpaul
grandpaul added this pull request to the merge queue Aug 26, 2026
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