Merge tag 'upstream/3.3.3'

[debian/amanda] / packaging / deb / postinst.src

diff --git a/packaging/deb/postinst.src b/packaging/deb/postinst.src
index 2497257fe52dfdb522d621842a3db3de3638e911..7054b67832ba2c55cf83b3521f2e30f9a230ea92 100644 (file)
--- a/packaging/deb/postinst.src
+++ b/packaging/deb/postinst.src
@@ -21,6 +21,7 @@ SBINDIR=/usr/sbin
 AMTMP="/tmp/amanda"
 
 AMANDATES=${SYSCONFDIR}/amandates
+encoder=`{ command -v base64 2>/dev/null; } || { command -v uuencode 2>/dev/null; }`
 
 # ---------- Common functions ------------
 %%COMMON_FUNCTIONS%%
@@ -47,10 +48,18 @@ case $? in
        0) backup_xinetd "amanda${other_pkg_type}" ;;
 esac
 
-reload_xinetd
+check_superserver_running "xinetd"
+[ "$?" = "0" ] && action=restart || action=start
+reload_xinetd $action
 create_amandates
 check_amandates
+create_ampassphrase || \
+    logger "Info: amcryptsimple and amcrpyt will not work until .am_passphrase is created"
 create_gnupg
+create_amkey || \
+    logger "Info: amcrypt will not work until keys are created."
+# Checks permissions, but only tries decrypting if both .am_passphrase
+# and .gnupg/am_key.gpg exist.
 check_gnupg
 create_amandahosts
 check_amandahosts_entry root amindexd amidxtaped
@@ -63,7 +72,6 @@ fi
 create_profile
 check_profile
 install_client_conf
-create_ampassphrase
 create_amtmp
 
 logger "Amanda ${pkg_type} installation complete."