From fcff3f416d30e0fac017d78d2cd6e6ac730c5cb8 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Wed, 19 Feb 2014 11:54:07 +0100 Subject: rely on dh_usrlocal --- debian/openssh-known-hosts.dirs | 1 + debian/openssh-known-hosts.postinst | 14 -------------- debian/openssh-known-hosts.prerm | 2 -- 3 files changed, 1 insertion(+), 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) ;; -- cgit v1.2.3