webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	config/rootfiles/core/59/update.sh
	lfs/strongswan
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-06-01 17:30:54 +02:00
parent 3648650e76 1346863ac7
commit a832f4f33e
8 changed files with 107 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/core/59/update.sh
View File

@@ -34,12 +34,16 @@ done
#
#Stop services
/etc/init.d/ipsec stop
/etc/init.d/sshd stop
#
#Extract files
extract_files
#
#Start services
/etc/init.d/sshd start
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi

12
config/rootfiles/core/60/exclude Normal file
View File

@@ -0,0 +1,12 @@
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
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf

2
config/rootfiles/core/60/filelists/files Normal file
View File

@@ -0,0 +1,2 @@
etc/system-release
etc/issue

1
config/rootfiles/core/60/filelists/strongswan Symbolic link
View File

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

1
config/rootfiles/core/60/meta Normal file
View File

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

83
config/rootfiles/core/60/update.sh Normal file
View File

@@ -0,0 +1,83 @@
#!/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) 2012 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=60
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
#Stop services
/etc/init.d/ipsec stop
#
#Extract files
extract_files
#
#Start services
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#arch=`uname -m`
#if [ ${arch::3} == "arm" ]; then
# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
#else
# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
#fi
#Rebuild initrd's because some compat-wireless modules are inside
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
#fi
#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
#fi
sync
# This update need a reboot...
#touch /var/run/need_reboot
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0