diff options
author | Colin Watson <cjwatson@debian.org> | 2010-12-26 18:04:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-12-26 18:04:23 +0000 |
commit | 65436a2d34fb6d47306c92dd409c6844a77f121a (patch) | |
tree | 7bf87623a3e94d25d095b6632d2358f5eb893d63 | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) |
Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
which is intentionally no longer shipped in the openssh-server package
due to /var/run often being a temporary directory, is not removed on
upgrade (closes: #575582).
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/openssh-server.postinst | 3 | ||||
-rw-r--r-- | debian/openssh-server.preinst | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 47aee318f..eaa807618 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,12 @@ | |||
1 | openssh (1:5.5p1-6) UNRELEASED; urgency=low | ||
2 | |||
3 | * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd, | ||
4 | which is intentionally no longer shipped in the openssh-server package | ||
5 | due to /var/run often being a temporary directory, is not removed on | ||
6 | upgrade (closes: #575582). | ||
7 | |||
8 | -- Colin Watson <cjwatson@ubuntu.com> Sun, 26 Dec 2010 18:01:12 +0000 | ||
9 | |||
1 | openssh (1:5.5p1-5) unstable; urgency=low | 10 | openssh (1:5.5p1-5) unstable; urgency=low |
2 | 11 | ||
3 | * Use an architecture wildcard for libselinux1-dev (closes: #591740). | 12 | * Use an architecture wildcard for libselinux1-dev (closes: #591740). |
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst index 325af4ef4..4ed956454 100644 --- a/debian/openssh-server.postinst +++ b/debian/openssh-server.postinst | |||
@@ -473,6 +473,9 @@ commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd | |||
473 | if dpkg --compare-versions "$2" lt 1:4.7p1-1; then | 473 | if dpkg --compare-versions "$2" lt 1:4.7p1-1; then |
474 | rm -f /etc/ssh/primes | 474 | rm -f /etc/ssh/primes |
475 | fi | 475 | fi |
476 | if dpkg --compare-versions "$2" lt 1:5.5p1-6; then | ||
477 | rm -f /var/run/sshd/.placeholder | ||
478 | fi | ||
476 | 479 | ||
477 | 480 | ||
478 | db_stop | 481 | db_stop |
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst index 43c4b57f9..510070645 100644 --- a/debian/openssh-server.preinst +++ b/debian/openssh-server.preinst | |||
@@ -134,6 +134,12 @@ EOF | |||
134 | if dpkg --compare-versions "$version" lt 1:4.7p1-4; then | 134 | if dpkg --compare-versions "$version" lt 1:4.7p1-4; then |
135 | prepare_mv_conffile /etc/pam.d/ssh | 135 | prepare_mv_conffile /etc/pam.d/ssh |
136 | fi | 136 | fi |
137 | |||
138 | if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \ | ||
139 | [ -d /var/run/sshd ]; then | ||
140 | # make sure /var/run/sshd is not removed on upgrades | ||
141 | touch /var/run/sshd/.placeholder | ||
142 | fi | ||
137 | fi | 143 | fi |
138 | 144 | ||
139 | #DEBHELPER# | 145 | #DEBHELPER# |