From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 22 Apr 2009 17:17:22 +0000 (+0200)
Subject: Set Version to 2.5beta1
X-Git-Tag: v2.5-beta1~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=aba23e91dc7ad664fbf0f8f4d55539b677ad5061

Set Version to 2.5beta1
---

diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index f0145c4439..d20dbe8055 100644
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -29,3 +29,4 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+usr/local/bin/backupiso
diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
index 347d197796..3268cd3e66 100755
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -25,7 +25,7 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
 OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
-NEWVERSION="2.3"
+NEWVERSION="2.5"
 #
 KVER="2.6.27.21"
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
@@ -122,7 +122,7 @@ sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
 #
 # Create new issue
 #
-echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
+echo IPFire v$NEWVERSION beta1 - www.ipfire.org > /etc/issue
 echo =================================== >> /etc/issue
 echo \\n running on \\s \\r \\m >> /etc/issue
 #
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 28518867ed..8d32b72fcb 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -73,7 +73,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
 $sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.3';
+$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.5';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
 $sambasettings{'OSLEVEL'} = '33';
diff --git a/make.sh b/make.sh
index e645cefcbb..ec5c7b03df 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3"
+VERSION="2.5beta1"
 CORE="28"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index 6c4dea5d56..56786cf033 100644
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -21,7 +21,7 @@
 
 package Conf;
 
-$version = "2.3";
+$version = "2.5";
 
 $mainserver = "pakfire.ipfire.org";
 
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index bbcfe29c9e..71e79740b6 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,10 +1,9 @@
 #!/bin/sh
 
+COREVER=`cat /opt/pakfire/db/core/mine`
 # FIXME: edit this lines before release
 URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.3.i586-full-core27.iso
-#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
-#ISO=ipfire-2.3-test.i586-full.iso
+ISO=ipfire-2.5.i586-full-core$COREVER.iso
 
 if [ -z "$1" ]; then 
 	echo usage: $0 backup-file