Skip to content

[v1.x] Preserve existing Merlin dnsmasq.postconf content #6

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
maghuro merged 4 commits into from
Sep 27, 2026
Merged

[v1.x] Preserve existing Merlin dnsmasq.postconf content #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdfa0a0
Port Merlin postconf coexistence to v1.x
maghuro Sep 27, 2026
4fff873
Port Merlin postconf coexistence to v1.x
maghuro Sep 27, 2026
470397c
Port Merlin postconf coexistence to v1.x
maghuro Sep 27, 2026
f1701d0
Make mode preservation test umask-safe
maghuro Sep 27, 2026
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
25 changes: 14 additions & 11 deletions internal/router/dnsmasq/dnsmasq.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package dnsmasq

import (
"errors"
"text/template"
"net"
"os"
"path/filepath"
"strings"
"text/template"

"github.com/Control-D-Inc/ctrld"
)
Expand All @@ -28,17 +28,21 @@ max-cache-ttl=0
`

const (
MerlinConfPath = "/tmp/etc/dnsmasq.conf"
MerlinJffsConfDir = "/jffs/configs"
MerlinJffsConfPath = "/jffs/configs/dnsmasq.conf"
MerlinPostConfPath = "/jffs/scripts/dnsmasq.postconf"
MerlinConfPath = "/tmp/etc/dnsmasq.conf"
MerlinJffsConfDir = "/jffs/configs"
MerlinJffsConfPath = "/jffs/configs/dnsmasq.conf"
MerlinPostConfPath = "/jffs/scripts/dnsmasq.postconf"
)

const MerlinPostConfMarker = `# GENERATED BY ctrld - EOF`
const MerlinPostConfTmpl = `# GENERATED BY ctrld - DO NOT MODIFY

#!/bin/sh
const (
MerlinPostConfBeginMarker = `# BEGIN ctrld`
MerlinPostConfEndMarker = `# END ctrld`
MerlinSyntheticShebangMarker = `# ctrld: synthetic shebang`
// MerlinPostConfMarker is the legacy end marker used by ctrld <= 1.5.7.
MerlinPostConfMarker = `# GENERATED BY ctrld - EOF`
)

const MerlinPostConfTmpl = `(
config_file="$1"
. /usr/sbin/helper.sh

Expand Down Expand Up @@ -66,9 +70,8 @@ if [ -n "$pid" ] && [ -f "/proc/${pid}/cmdline" ]; then
# Change /etc/resolv.conf, which may be changed by WAN DNS setup
pc_delete "nameserver" /etc/resolv.conf
pc_append "nameserver 127.0.0.1" /etc/resolv.conf

exit 0
fi
)
`

type Upstream struct {
Expand Down
Loading
Loading