From e039edbbf74628cd507248a1c55885d0387d8c2a Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Wed, 21 Jan 2015 10:33:21 +0100 Subject: [PATCH] Option --enable-copy-only should not activate a crontab Make sure that no crontabs are activated when option --enable-copy-only is used with ./configure. Signed-off-by: Sebastien GODARD --- Makefile.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index a7c7910..bb4d231 100644 --- a/Makefile.in +++ b/Makefile.in @@ -377,13 +377,18 @@ endif elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ - else \ + fi \ + fi +ifeq ($(COPY_ONLY),n) + if [ ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" -a ! -d $(DESTDIR)/etc/cron.d ]; then \ + if [ ! -d $(DESTDIR)/etc/cron.hourly -o ! -d $(DESTDIR)/etc/cron.daily ]; then \ su $(CRON_OWNER) -c "crontab -l > /tmp/crontab-$(CRON_OWNER).save"; \ $(CP) -a /tmp/crontab-$(CRON_OWNER).save ./crontab-$(CRON_OWNER).`date '+%Y%m%d.%H%M%S'`.save; \ echo "USER'S PREVIOUS CRONTAB SAVED IN CURRENT DIRECTORY (USING .save SUFFIX)."; \ su $(CRON_OWNER) -c "crontab cron/crontab"; \ fi \ fi +endif if [ -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \ $(INSTALL_DATA) sysstat.service $(DESTDIR)$(SYSTEMD_UNIT_DIR); \ $(INSTALL_DATA) cron/sysstat-collect.service $(DESTDIR)$(SYSTEMD_UNIT_DIR); \ @@ -491,13 +496,13 @@ endif @echo "Please ignore the errors above, if any." uninstall_all: uninstall_base +ifeq ($(COPY_ONLY),n) if [ ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \ -su $(CRON_OWNER) -c "crontab -l > /tmp/crontab-$(CRON_OWNER).old" ; \ -$(CP) -a /tmp/crontab-$(CRON_OWNER).old ./crontab-$(CRON_OWNER).`date '+%Y%m%d.%H%M%S'`.old ; \ @echo "USER CRONTAB SAVED IN CURRENT DIRECTORY (WITH .old SUFFIX)." ; \ -su $(CRON_OWNER) -c "crontab -r" ; \ fi -ifeq ($(COPY_ONLY),n) if [ -x $(SYSTEMCTL) ]; then \ $(SYSTEMCTL) disable sysstat.service; \ fi -- 2.40.0