aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-23 12:52:22 +0100
committerUlrich Müller <ulm@gentoo.org>2013-03-23 12:52:22 +0100
commitbed97d1e77dd5161fc8513a156e85e334e987ea1 (patch)
treea5a9e60c307583b82861d66b636640e0cb2aae3f
parentVersion 0.19 released. (diff)
downloademacs-tools-bed97d1e77dd5161fc8513a156e85e334e987ea1.tar.gz
emacs-tools-bed97d1e77dd5161fc8513a156e85e334e987ea1.tar.bz2
emacs-tools-bed97d1e77dd5161fc8513a156e85e334e987ea1.zip
Specify retry schedule for stop.
* emacs.rc (stop): Specify retry schedule for start-stop-daemon: Send SIGTERM, wait for EMACS_TIMEOUT, then send SIGKILL.
-rw-r--r--ChangeLog5
-rw-r--r--emacs.rc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 452eaa0..80137ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-23 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs.rc (stop): Specify retry schedule for start-stop-daemon:
+ Send SIGTERM, wait for EMACS_TIMEOUT, then send SIGKILL.
+
2012-07-21 Ulrich Müller <ulm@gentoo.org>
* Version 0.19 released.
diff --git a/emacs.rc b/emacs.rc
index 67ddd2d..8bef6da 100644
--- a/emacs.rc
+++ b/emacs.rc
@@ -74,7 +74,7 @@ stop() {
fi
ebegin "Stopping Emacs daemon for user ${USER}"
- start-stop-daemon --stop \
+ start-stop-daemon --stop --retry "TERM/${EMACS_TIMEOUT}/KILL/5" \
--user "${USER}" --pidfile "${PIDFILE}" --exec "${EMACS}"
eend $?
}