diff options
author | Colin Watson <cjwatson@debian.org> | 2006-12-06 21:55:19 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-12-06 21:55:19 +0000 |
commit | e2f4fb43875e216cbcf7cabbb621ecb205c24857 (patch) | |
tree | 65aac6efdb62456154277787f5fdf4e718997684 /debian/openssh-client.postinst | |
parent | d23e75730cfd617b7638e3b8013e3e1f3a1ecce9 (diff) |
* When installing openssh-client or openssh-server from scratch, remove
any unchanged conffiles from the pre-split ssh package to work around a
bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
Diffstat (limited to 'debian/openssh-client.postinst')
-rw-r--r-- | debian/openssh-client.postinst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst index 466801057..3e33aeb82 100644 --- a/debian/openssh-client.postinst +++ b/debian/openssh-client.postinst | |||
@@ -94,6 +94,13 @@ set_ssh_agent_permissions() { | |||
94 | fi | 94 | fi |
95 | } | 95 | } |
96 | 96 | ||
97 | commit_transfer_conffile () { | ||
98 | CONFFILE="$1" | ||
99 | if [ -e "$CONFFILE.moved-by-preinst" ]; then | ||
100 | rm -f "$CONFFILE.moved-by-preinst" | ||
101 | fi | ||
102 | } | ||
103 | |||
97 | 104 | ||
98 | fix_rsh_diversion | 105 | fix_rsh_diversion |
99 | create_alternatives | 106 | create_alternatives |
@@ -102,5 +109,7 @@ if [ "$2" = "1:3.5p1-1" ]; then | |||
102 | fix_ssh_group | 109 | fix_ssh_group |
103 | fi | 110 | fi |
104 | set_ssh_agent_permissions | 111 | set_ssh_agent_permissions |
112 | commit_transfer_conffile /etc/ssh/moduli | ||
113 | commit_transfer_conffile /etc/ssh/ssh_config | ||
105 | 114 | ||
106 | exit 0 | 115 | exit 0 |