From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93
Date: Tue, 05 May 2015 20:20:47 +0200 [thread overview]
Message-ID: <20150505182048.11EC122311@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3124 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 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93 (commit)
via e1c540b08eb637ee26fd18696920a603a085ccbd (commit)
via b33e050763f5c752aadedc62c4da75f3392aca25 (commit)
via f63cb53f4aa6b049e01aad78a724c9b5dca1a42a (commit)
via 359efc4bfd201a2972387b30c93372541d56feab (commit)
from afdf1483887e7c31567ed4469b3b9922d213e295 (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 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93
Merge: afdf148 e1c540b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 5 20:20:29 2015 +0200
Merge remote-tracking branch 'stevee/next' into next
commit e1c540b08eb637ee26fd18696920a603a085ccbd
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon May 4 20:19:19 2015 +0200
Core 90: Add modified cgi files for firewall log statistics.
commit b33e050763f5c752aadedc62c4da75f3392aca25
Merge: f63cb53 dfbee17
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon May 4 20:16:24 2015 +0200
Merge remote-tracking branch 'stevee/next-cgi-geoip' into next
commit f63cb53f4aa6b049e01aad78a724c9b5dca1a42a
Merge: 359efc4 b59da37
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon May 4 20:15:24 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 359efc4bfd201a2972387b30c93372541d56feab
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon May 4 20:10:46 2015 +0200
Core90: Drop old and add new flag-icons.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/90/filelists/flag-icons | 1 +
config/rootfiles/core/90/update.sh | 3 +++
2 files changed, 4 insertions(+)
create mode 120000 config/rootfiles/core/90/filelists/flag-icons
Difference in files:
diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons
new file mode 120000
index 0000000..8776b6b
--- /dev/null
+++ b/config/rootfiles/core/90/filelists/flag-icons
@@ -0,0 +1 @@
+../../../common/flag-icons
\ No newline at end of file
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 68798cb..1e0a548 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -132,6 +132,9 @@ esac
/etc/init.d/ipsec stop
/etc/init.d/apache stop
+# Drop old flag icons, before extracting the new ones.
+rm /srv/web/ipfire/html/images/flags/*
+
#
#Extract files
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-05-05 18:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150505182048.11EC122311@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox