mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 10:52:57 +02:00
Merge commit 'origin/master' into next
Conflicts: lfs/libevent2 lfs/transmission src/paks/transmission/install.sh src/paks/transmission/uninstall.sh
This commit is contained in:
6
config/rootfiles/core/53/filelists/kvm-kmod
Normal file
6
config/rootfiles/core/53/filelists/kvm-kmod
Normal file
@@ -0,0 +1,6 @@
|
||||
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
|
||||
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
|
||||
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
|
||||
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
|
||||
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
|
||||
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=52
|
||||
core=53
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
|
||||
9
config/rootfiles/core/54/exclude
Normal file
9
config/rootfiles/core/54/exclude
Normal file
@@ -0,0 +1,9 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
var/updatecache
|
||||
etc/localtime
|
||||
var/ipfire/ovpn
|
||||
2
config/rootfiles/core/54/filelists/files
Normal file
2
config/rootfiles/core/54/filelists/files
Normal file
@@ -0,0 +1,2 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
1
config/rootfiles/core/54/meta
Normal file
1
config/rootfiles/core/54/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
60
config/rootfiles/core/54/update.sh
Normal file
60
config/rootfiles/core/54/update.sh
Normal file
@@ -0,0 +1,60 @@
|
||||
#!/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) 2011 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=54
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
#Stop services
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#depmod 2.6.32.45-ipfire >/dev/null 2>&1
|
||||
#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
|
||||
#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
Reference in New Issue
Block a user