summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Weingärtner <timo@tiwe.de>2014-02-19 11:54:07 +0100
committerTimo Weingärtner <timo@tiwe.de>2014-02-19 13:35:06 +0100
commitfcff3f416d30e0fac017d78d2cd6e6ac730c5cb8 (patch)
tree0c062420f7e8349c861d9a69f1fd1cea8c631959
parent75b9402b6acab095f8f14b378e643571eddb49a4 (diff)
downloadopenssh-known-hosts-fcff3f416d30e0fac017d78d2cd6e6ac730c5cb8.tar.gz
rely on dh_usrlocal
-rw-r--r--debian/openssh-known-hosts.dirs1
-rw-r--r--debian/openssh-known-hosts.postinst14
-rw-r--r--debian/openssh-known-hosts.prerm2
3 files changed, 1 insertions, 16 deletions
diff --git a/debian/openssh-known-hosts.dirs b/debian/openssh-known-hosts.dirs
index d89f29b..8a81ae9 100644
--- a/debian/openssh-known-hosts.dirs
+++ b/debian/openssh-known-hosts.dirs
@@ -2,3 +2,4 @@ var/lib/openssh-known-hosts
var/cache/openssh-known-hosts
etc/openssh-known-hosts/sources
etc/ssh
+usr/local/share/openssh-known-hosts/plugins
diff --git a/debian/openssh-known-hosts.postinst b/debian/openssh-known-hosts.postinst
index 58800e2..7caf740 100644
--- a/debian/openssh-known-hosts.postinst
+++ b/debian/openssh-known-hosts.postinst
@@ -20,20 +20,6 @@ set -e
case "$1" in
configure|abort-upgrade|abort-remove|abort-deconfigure)
- if [ ! -e /usr/local/share/openssh-known-hosts ]; then
- if mkdir /usr/local/share/openssh-known-hosts 2>/dev/null; then
- if chown root:staff /usr/local/share/openssh-known-hosts; then
- chmod 2775 /usr/local/share/openssh-known-hosts || true
- fi
- fi
- fi
- if [ ! -e /usr/local/share/openssh-known-hosts/plugins ]; then
- if mkdir /usr/local/share/openssh-known-hosts/plugins 2>/dev/null; then
- if chown root:staff /usr/local/share/openssh-known-hosts/plugins; then
- chmod 2775 /usr/local/share/openssh-known-hosts/plugins || true
- fi
- fi
- fi
[ -e /etc/ssh/ssh_known_hosts ] || ln -s /var/lib/openssh-known-hosts/ssh_known_hosts /etc/ssh/ssh_known_hosts
if [ "`readlink /etc/ssh/ssh_known_hosts`" != /var/lib/openssh-known-hosts/ssh_known_hosts ]; then
echo "/etc/ssh/ssh_known_hosts already exists, please set up the link to"
diff --git a/debian/openssh-known-hosts.prerm b/debian/openssh-known-hosts.prerm
index fc24391..259a2c0 100644
--- a/debian/openssh-known-hosts.prerm
+++ b/debian/openssh-known-hosts.prerm
@@ -23,8 +23,6 @@ case "$1" in
[ "`readlink /etc/ssh/ssh_known_hosts`" = /var/lib/openssh-known-hosts/ssh_known_hosts ]; then
rm /etc/ssh/ssh_known_hosts
fi
- rmdir /usr/local/share/openssh-known-hosts/plugins 2>/dev/null || true
- rmdir /usr/local/share/openssh-known-hosts 2>/dev/null || true
;;
upgrade|failed-upgrade)
;;