From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 19 Apr 2016 20:04:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/core100' into next
X-Git-Tag: v2.19-core101~6
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c485f38c996cab87c98a78f1cadc2c2197d30625

Merge remote-tracking branch 'origin/core100' into next
---

c485f38c996cab87c98a78f1cadc2c2197d30625
diff --cc config/rootfiles/oldcore/100/exclude
index 8e446ce6ca,0000000000..7ddeae0ba3
mode 100644,000000..100644
--- a/config/rootfiles/oldcore/100/exclude
+++ b/config/rootfiles/oldcore/100/exclude
@@@ -1,26 -1,0 +1,28 @@@
 +boot/config.txt
++boot/grub/grub.cfg
++boot/grub/grubenv
 +etc/alternatives
 +etc/collectd.custom
 +etc/default/grub
 +etc/ipsec.conf
 +etc/ipsec.secrets
 +etc/ipsec.user.conf
 +etc/ipsec.user.secrets
 +etc/localtime
 +etc/shadow
 +etc/snort/snort.conf
 +etc/ssh/ssh_config
 +etc/ssh/sshd_config
 +etc/ssl/openssl.cnf
 +etc/sudoers
 +etc/sysconfig/firewall.local
 +etc/sysconfig/rc.local
 +etc/udev/rules.d/30-persistent-network.rules
 +srv/web/ipfire/html/proxy.pac
 +var/ipfire/dma
 +var/ipfire/time
 +var/ipfire/ovpn
 +var/lib/alternatives
 +var/log/cache
 +var/state/dhcp/dhcpd.leases
 +var/updatecache