diff options
| author | Michael Biebl <biebl@debian.org> | 2015-03-31 07:23:49 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-03-31 07:24:18 +0200 |
| commit | a09f52a760211d4862e3cd00fdb9cae7d74df969 (patch) | |
| tree | 615edef9751d699627a4fdbdf9afb1d7e225b237 /debian/network-manager.preinst | |
| parent | 6a450ee254d54eefdd8c855a6aafe9dfe4cf419f (diff) | |
| parent | bb2f8764ee893b3dd02b9a4bcd2706ac763d2455 (diff) | |
Merge changes from master branch.
* Don't make NetworkManager D-Bus activatable. If the daemon has been stopped manually, we don't want it to be autostarted by client requests. (Closes: #760998) * Don't block network.target on NetworkManager-wait-online.service. While at it, add a few other minor fixes like the addition of Documentation or RemainAfterExit=yes.
Diffstat (limited to 'debian/network-manager.preinst')
| -rw-r--r-- | debian/network-manager.preinst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 62aadf1e..61916284 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -25,6 +25,12 @@ case "$1" in fi fi + if dpkg --compare-versions "$2" lt "0.9.10.0-7"; then + if [ -L /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ]; then + rm -f /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + fi + fi + # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.9.7.997-2"; then # Move old pid file to /var/run/NetworkManager so the init script |