Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
config/rootfiles/core/90/filelists/flag-icons [new symlink]
config/rootfiles/core/90/update.sh

diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons
new file mode 120000 (symlink)
index 0000000..8776b6b
--- /dev/null
@@ -0,0 +1 @@
+../../../common/flag-icons
\ No newline at end of file
index 68798cb..1e0a548 100644 (file)
@@ -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 /