From: Arne Fitzenreiter Date: Tue, 12 Jan 2010 18:28:18 +0000 (+0100) Subject: Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-beta1~524 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=de20524ed3e6aaab52bb3009c807ae3602f8e273 Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x Conflicts: config/rootfiles/core/35/filelists/files --- de20524ed3e6aaab52bb3009c807ae3602f8e273 diff --cc config/rootfiles/core/35/filelists/files index 761f4f5610,0e5c74eaf8..15fca78431 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@@ -1,13 -1,4 +1,15 @@@ etc/system-release srv/web/ipfire/cgi-bin/country.cgi +etc/modprobe.d/hostap +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off + srv/web/ipfire/cgi-bin/outgoingfw.cgi -var/ipfire/outgoing/bin/outgoingfw.pl ++var/ipfire/outgoing/bin/outgoingfw.pl