From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 May 2015 18:20:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/next' into next
X-Git-Tag: v2.17-core91~73
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93;hp=afdf1483887e7c31567ed4469b3b9922d213e295

Merge remote-tracking branch 'stevee/next' into next
---

diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons
new file mode 120000
index 0000000000..8776b6b790
--- /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 68798cb84d..1e0a548811 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 /