This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 6acda73be0ef6c20182a9eb85904a2df3613e9c3 (commit) via 184bee29d09351f9b47876c785027dc5b4c264ab (commit) via 792ff4fa0b2d2bc21e340ad583229c274213213d (commit) via 2d57443beb7b153af4335c2b6dd5f91b3edcfd95 (commit) via 5db3741f3721d32fe4eacac0c0bacf981fbfedc8 (commit) via 11cbd00d1fca7e1ae0780331d940b3a364f167d3 (commit) from c0ec89791d264825da02d18003443be3d18506b5 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 6acda73be0ef6c20182a9eb85904a2df3613e9c3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 5 16:49:37 2012 +0100

started core57.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/55/exclude | 3 +++ config/rootfiles/core/56/exclude | 3 +++ config/rootfiles/core/56/filelists/files | 2 ++ config/rootfiles/core/{55 => 57}/exclude | 3 +++ config/rootfiles/core/57/filelists/files | 4 ++++ config/rootfiles/core/{52 => 57}/meta | 0 config/rootfiles/core/{55 => 57}/update.sh | 10 +++------- make.sh | 2 +- src/initscripts/init.d/fsresize | 2 +- 9 files changed, 20 insertions(+), 9 deletions(-) copy config/rootfiles/core/{55 => 57}/exclude (76%) create mode 100644 config/rootfiles/core/57/filelists/files copy config/rootfiles/core/{52 => 57}/meta (100%) copy config/rootfiles/core/{55 => 57}/update.sh (95%)

Difference in files: diff --git a/config/rootfiles/core/55/exclude b/config/rootfiles/core/55/exclude index ca3adf5..7360266 100644 --- a/config/rootfiles/core/55/exclude +++ b/config/rootfiles/core/55/exclude @@ -7,3 +7,6 @@ etc/ipsec.user.secrets var/updatecache etc/localtime var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/56/exclude b/config/rootfiles/core/56/exclude index ca3adf5..7360266 100644 --- a/config/rootfiles/core/56/exclude +++ b/config/rootfiles/core/56/exclude @@ -7,3 +7,6 @@ etc/ipsec.user.secrets var/updatecache etc/localtime var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index 7b1d4c0..355107e 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -2,6 +2,8 @@ etc/system-release etc/issue etc/rc.d/init.d/mountfs etc/rc.d/init.d/smartenabler +etc/rc.d/init.d/networking/red.up/10-static-routes +etc/rc.d/init.d/networking/red.down/10-static-routes srv/web/ipfire/cgi-bin/chpasswd.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/media.cgi diff --git a/config/rootfiles/core/57/exclude b/config/rootfiles/core/57/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/57/exclude @@ -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 diff --git a/config/rootfiles/core/57/filelists/files b/config/rootfiles/core/57/filelists/files new file mode 100644 index 0000000..a678ee8 --- /dev/null +++ b/config/rootfiles/core/57/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/networking/red.up/10-static-routes +etc/rc.d/init.d/networking/red.down/10-static-routes diff --git a/config/rootfiles/core/57/meta b/config/rootfiles/core/57/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/57/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh new file mode 100644 index 0000000..2f78a25 --- /dev/null +++ b/config/rootfiles/core/57/update.sh @@ -0,0 +1,74 @@ +#!/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=57 +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 -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 + +#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 diff --git a/make.sh b/make.sh index 6e576e0..f425428 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="56" # Core Level (Filename) +CORE="57" # Core Level (Filename) PAKFIRE_CORE="56" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/fsresize index 0afe779..8913eb9 100644 --- a/src/initscripts/init.d/fsresize +++ b/src/initscripts/init.d/fsresize @@ -26,7 +26,7 @@ case "${1}" in ROOT=`mount | grep -m1 " / " | cut -d" " -f1`; DRV=${ROOT::`expr length $ROOT`-1} boot_mesg " * check filesystem on ${DRV}4 before resize ..." - fsck -f ${DRV}4 + fsck -f -y ${DRV}4

boot_mesg " * resize ${DRV}4 ..." resize2fs -p ${DRV}4

hooks/post-receive -- IPFire 2.x development tree