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, master has been updated via c8783a6ae53a40fc2b84035074f30f8d85fdf17c (commit) via 4594712a1777fdd03b51491cf82bd06d45c16472 (commit) from b6785f2ef8bce570e6db66add579a2a89ee1ec78 (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 c8783a6ae53a40fc2b84035074f30f8d85fdf17c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 8 00:08:09 2010 +0200

Change version to 2.7 on core38.

commit 4594712a1777fdd03b51491cf82bd06d45c16472 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jun 7 23:56:16 2010 +0200

Set version to "2.7".

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

Summary of changes: config/rootfiles/core/38/filelists/files | 1 + config/rootfiles/core/38/update.sh | 16 ++++++++++++++++ html/cgi-bin/samba.cgi | 2 +- make.sh | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 6c7f0c6..8290804 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/issue etc/e2fsck.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/rc.d/init.d/leds diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 59a718c..9af7aad 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -24,6 +24,19 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # +OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +# +# Test if we running on xen +# +uname -r | grep "ipfire-xen"; +if [ ${?} = 0 ]; then + #Xen Kernel is active + NEWVERSION="2.7-xen" +else + #Normal Kernel + NEWVERSION="2.7" +fi +# KVER="2.6.32.15" ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` @@ -220,6 +233,9 @@ echo "cryptodev" >> /etc/sysconfig/modules echo "" >> /etc/sysconfig/modules echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules chmod 644 /etc/sysconfig/modules +# Change version of Pakfire.conf +# +sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf # # This core-update need a reboot /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4d90914..13a7a82 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');

$sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.5'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '33'; diff --git a/make.sh b/make.sh index b6281bb..9eca589 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@

NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.6" # Version number +VERSION="2.7" # Version number CORE="38" # Core Level (Filename) PAKFIRE_CORE="38" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch

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