diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz index 73ac4d3..b2dd4f5 100644 Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ diff --git a/scripts/latecommand/post.sh b/scripts/latecommand/post.sh index a771d61..c196dfd 100755 --- a/scripts/latecommand/post.sh +++ b/scripts/latecommand/post.sh @@ -1,22 +1,22 @@ #!/bin/sh -APT_CONF_INCLUDE_SRC="$(dirname $0)/stretch/etc/apt/apt.conf.d/*" +APT_CONF_INCLUDE_SRC="$(dirname $0)/stretch/etc/apt/apt.conf.d/" APT_CONF_INCLUDE_PATH="/etc/apt/apt.conf.d/" RSYSLOGD_CONF_SRC="$(dirname $0)/stretch/etc/rsyslog.conf" RSYSLOGD_CONF_PATH="/etc/rsyslog.conf" -RSYSLOGD_INCLUDE_SRC="$(dirname $0)/stretch/etc/rsyslog.d/*" +RSYSLOGD_INCLUDE_SRC="$(dirname $0)/stretch/etc/rsyslog.d/" RSYSLOGD_INCLUDE_PATH="/etc/rsyslog.d/" LOGROTATE_CONF_SRC="$(dirname $0)/stretch/etc/logrotate.conf" LOGROTATE_CONF_PATH="/etc/logrotate.conf" -LOGROTATE_INCLUDE_SRC="$(dirname $0)/stretch/etc/logrotate.d/*" +LOGROTATE_INCLUDE_SRC="$(dirname $0)/stretch/etc/logrotate.d/" LOGROTATE_INCLUDE_PATH="/etc/logrotate.d/" # apt configuration {{{ # ensure to have some default configuration for Apt -cp -- "${APT_CONF_INCLUDE_SRC}" "${APT_CONF_INCLUDE_PATH}" +cp -- "${APT_CONF_INCLUDE_SRC}"* "${APT_CONF_INCLUDE_PATH}" # }}} @@ -84,7 +84,7 @@ fi if [ -f "${RSYSLOGD_CONF_PATH}" ]; then cp "${RSYSLOGD_CONF_SRC}" "${RSYSLOGD_CONF_PATH}" fi -cp -- "${RSYSLOGD_INCLUDE_SRC}" "${RSYSLOGD_INCLUDE_PATH}" +cp -- "${RSYSLOGD_INCLUDE_SRC}"* "${RSYSLOGD_INCLUDE_PATH}" # Restart Rsyslog service systemctl restart rsyslog @@ -97,7 +97,7 @@ systemctl restart rsyslog if [ -f "${LOGROTATE_CONF_PATH}" ]; then cp "${LOGROTATE_CONF_SRC}" "${LOGROTATE_CONF_PATH}" fi -cp -- "${LOGROTATE_INCLUDE_SRC}" "${LOGROTATE_INCLUDE_PATH}" +cp -- "${LOGROTATE_INCLUDE_SRC}"* "${LOGROTATE_INCLUDE_PATH}" # Create an archive directory for some log files (aptitude, dpkg,…) mkdir -p -- /var/log/old_logs.d /var/log/aptitude.d /var/log/dpkg.d /var/log/alternatives.d /var/log/syslog.d /var/log/cron.d /var/log/daemon.d /var/log/kern.d /var/log/lpr.d /var/log/mail.d /var/log/auth.d /var/log/messages.d