Merge branch 'kernel2.6.32.8' into next

Conflicts:
	doc/packages-list.txt
	lfs/linux
This commit is contained in:
Arne Fitzenreiter
2010-02-14 11:33:02 +01:00
54 changed files with 5207 additions and 818 deletions

View File

@@ -0,0 +1 @@
etc/modprobe.d/madwifi

View File

@@ -0,0 +1,13 @@
etc/system-release
lib/modules/2.6.27.42-ipfire/kernel/net
lib/modules/2.6.27.42-ipfire-xen/kernel/net
lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko
lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko
lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko
lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
lib/modules/2.6.27.42-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
lib/modules/2.6.27.42-ipfire-xen/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi

View File

@@ -0,0 +1 @@
../../../common/lm_sensors

View File

@@ -0,0 +1 @@
../../../common/madwifi

View File

@@ -0,0 +1 @@
DEPS=""

View File

@@ -0,0 +1,49 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 3 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
#Stop services
#
#Extract files
extract_files
#
#Start services
#
#Delete sensors config to force new scan
rm -f /etc/sysconfig/lm_sensors
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#
#Run depmod to rebuld module informations
depmod 2.6.27.42-ipfire
depmod 2.6.27.42-ipfire-xen
#Finish
#Don't report the exitcode last command
exit 0