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

Merge branch 'master' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-09-07 14:01:27 +02:00
parent 39b14828ca 6d7da25360
commit ea1fa59632
6 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/52/update.sh
View File

@@ -34,6 +34,7 @@ done
#
#Stop services
/etc/init.d/squid stop
/etc/init.d/apache stop
#
@@ -43,6 +44,7 @@ extract_files
#
#Start services
/etc/init.d/apache start
/etc/init.d/squid start
#
#Update Language cache

2
config/rootfiles/core/53/exclude Normal file
View File

@@ -0,0 +1,2 @@
srv/web/ipfire/html/proxy.pac
var/updatecache

1
config/rootfiles/core/53/filelists/files Normal file
View File

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

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

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

63
config/rootfiles/core/53/update.sh Normal file
View File

@@ -0,0 +1,63 @@
#!/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=53
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
#Stop services
/etc/init.d/squid stop
/etc/init.d/apache stop
#
#Extract files
extract_files
#
#Start services
/etc/init.d/apache start
/etc/init.d/squid start
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod 2.6.32.43-ipfire >/dev/null 2>&1
#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0

4
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.10" # Version number
CORE="52" # Core Level (Filename)
PAKFIRE_CORE="51" # Core Level (PAKFIRE)
CORE="53" # Core Level (Filename)
PAKFIRE_CORE="52" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir