[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c460d5c25e231ab6322dcbb13bc04e6e56d5d7f6

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c460d5c25e231ab6322dcbb13bc04e6e56d5d7f6

[git]

[-- Attachment #1: Type: text/plain, Size: 2400 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c460d5c25e231ab6322dcbb13bc04e6e56d5d7f6 (commit)
      from  29afd40851ae28a332a59f39be40bec5bbd6010f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c460d5c25e231ab6322dcbb13bc04e6e56d5d7f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 3 17:57:38 2015 +0100

    logrotate: Fix an empty /etc/logrotate.d directory
    
    Fixes #10625

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/logrotate  | 2 ++
 config/rootfiles/core/88/update.sh | 3 +++
 lfs/logrotate                      | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/common/logrotate b/config/rootfiles/common/logrotate
index 8410c39..7f3e709 100644
--- a/config/rootfiles/common/logrotate
+++ b/config/rootfiles/common/logrotate
@@ -1,3 +1,5 @@
+#etc/logrotate.d
+etc/logrotate.d/.empty
 #usr/man/man8/logrotate.8
 usr/sbin/logrotate
 var/lib/logrotate.status
diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh
index c93e6b3..18dd9af 100644
--- a/config/rootfiles/core/88/update.sh
+++ b/config/rootfiles/core/88/update.sh
@@ -48,6 +48,9 @@ rm -f \
 	/opt/pakfire/db/installed/meta-sqlite \
 	/opt/pakfire/db/rootfiles/sqlite
 
+# Fix #10625
+mkdir -p /etc/logrotate.d
+
 sync
 
 # This update need a reboot...
diff --git a/lfs/logrotate b/lfs/logrotate
index 54afba1..8f81b2d 100644
--- a/lfs/logrotate
+++ b/lfs/logrotate
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	touch /var/lib/logrotate.status
+	mkdir -pv /etc/logrotate.d
+	touch /etc/logrotate.d/.empty /var/lib/logrotate.status
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree