Commit 6e14dff8 authored by Martin Pitt's avatar Martin Pitt
Browse files

debian/systemd.postinst: Don't always restart journald

This currently can't be done without losing the current journal and breaking
attached processes. So only restart it from upgrades < 215-3 (where the socket
location got moved) as an one-time upgrade path from wheezy.

Closes: #771122
parent 917d7123
......@@ -23,6 +23,11 @@ systemd (215-8) UNRELEASED; urgency=medium
[ Martin Pitt ]
* Clean up ...journal~ files from unclean shutdowns. (Closes: #771707)
* debian/systemd.postinst: Don't always restart journald, as this currently
can't be done without losing the current journal and breaking attached
processes. So only restart it from upgrades < 215-3 (where the socket
location got moved) as an one-time upgrade path from wheezy.
(Closes: #771122)
-- Sjoerd Simons <sjoerd@debian.org> Mon, 01 Dec 2014 22:44:48 +0100
......
......@@ -132,7 +132,6 @@ fi
if [ -n "$2" ]; then
_systemctl daemon-reexec || true
_systemctl try-restart systemd-journald.service || true
_systemctl try-restart systemd-logind.service || true
_systemctl try-restart systemd-networkd.service || true
_systemctl try-restart systemd-resolved.service || true
......@@ -141,7 +140,9 @@ fi
# The /dev/log socket and /dev/initctl FIFO have been moved to /run and
# replaced by symlinks. Create the symlinks manually on upgrades as well.
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761340
# (https://bugs.debian.org/761340). Note that this will break the current
# journal as we cannot restart it properly (https://bugs.debian.org/771122) so
# this is mostly an one-time upgrade path from wheezy.
if dpkg --compare-versions "$2" lt-nl "215-3"; then
if [ -p /run/systemd/initctl/fifo ] && [ ! -L /dev/initctl ]; then
ln -sf /run/systemd/initctl/fifo /dev/initctl
......@@ -149,6 +150,7 @@ if dpkg --compare-versions "$2" lt-nl "215-3"; then
if [ -S /run/systemd/journal/dev-log ] && [ ! -L /dev/log ]; then
ln -sf /run/systemd/journal/dev-log /dev/log
fi
_systemctl try-restart systemd-journald.service || true
fi
#DEBHELPER#
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment