Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
a23949d4
Commit
a23949d4
authored
May 09, 2014
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debian change: write pid-file even using systemd.
parent
b692f234
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
debian/changelog
debian/changelog
+7
-0
debian/init
debian/init
+1
-2
debian/systemd.service
debian/systemd.service
+2
-3
No files found.
debian/changelog
View file @
a23949d4
dnsmasq (2.70-3) unstable; urgency=low
* Write a pid-file, even when being started using systemd, since
other components may wish to signal dnsmasq.
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 09 May 2014 20:45:11 +0000
dnsmasq (2.70-2) unstable; urgency=low
dnsmasq (2.70-2) unstable; urgency=low
* Ensure daemon not stared if dnsmasq package has been removed,
* Ensure daemon not stared if dnsmasq package has been removed,
...
...
debian/init
View file @
a23949d4
...
@@ -277,9 +277,8 @@ case "$1" in
...
@@ -277,9 +277,8 @@ case "$1" in
stop_resolvconf
stop_resolvconf
;;
;;
systemd-exec
)
systemd-exec
)
# --pid-file without argument disables writing a PIDfile, we don't need one with sytemd.
# Enable DBus by default because we use DBus activation with systemd.
# Enable DBus by default because we use DBus activation with systemd.
exec
$DAEMON
--keep-in-foreground
--
pid-file
--
enable-dbus
\
exec
$DAEMON
--keep-in-foreground
--enable-dbus
\
${
MAILHOSTNAME
:+
-m
$MAILHOSTNAME
}
\
${
MAILHOSTNAME
:+
-m
$MAILHOSTNAME
}
\
${
MAILTARGET
:+
-t
$MAILTARGET
}
\
${
MAILTARGET
:+
-t
$MAILTARGET
}
\
${
DNSMASQ_USER
:+
-u
$DNSMASQ_USER
}
\
${
DNSMASQ_USER
:+
-u
$DNSMASQ_USER
}
\
...
...
debian/systemd.service
View file @
a23949d4
...
@@ -13,9 +13,8 @@ ExecStartPre=/usr/sbin/dnsmasq --test
...
@@ -13,9 +13,8 @@ ExecStartPre=/usr/sbin/dnsmasq --test
# itself, when called with the "systemd-exec" function.
# itself, when called with the "systemd-exec" function.
#
#
# It also adds the command-line flags
# It also adds the command-line flags
# --keep-in-foreground --pid-file --enable-dbus
# --keep-in-foreground --enable-dbus
# to disable writing a pid-file (not needed with systemd) and
# to enable DBus by default because we use DBus activation.
# enable DBus by default because we use DBus activation.
#
#
ExecStart=/etc/init.d/dnsmasq systemd-exec
ExecStart=/etc/init.d/dnsmasq systemd-exec
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment