Changed Version from 2.2-test to 2.2

Changed make.sh to push to master
Edit some IPFire 2.1 strings to 2.2
This commit is contained in:
Arne Fitzenreiter
2008-06-14 11:18:37 +02:00
parent d081796374
commit a2deff9ce2
4 changed files with 9 additions and 8 deletions

View File

@@ -5,6 +5,7 @@ etc/rc.d/init.d/network
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/red.up/40-ipac
etc/linuxigd/gatedesc.xml
usr/local/bin/getiptstate
usr/local/bin/makegraphs
srv/web/ipfire/cgi-bin/speed.cgi

View File

@@ -9,7 +9,7 @@
<friendlyName>IPFire UPnP Device</friendlyName>
<manufacturer>IPFire Project</manufacturer>
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelName>IPFire 2.1</modelName>
<modelName>IPFire 2.2</modelName>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<iconList>
<icon>
@@ -37,9 +37,9 @@
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelDescription>WAN Device on Linux IGD</modelDescription>
<modelName>IPFire</modelName>
<modelNumber>2.1</modelNumber>
<modelNumber>2.2</modelNumber>
<modelURL>http://linux-igd.sourceforge.net</modelURL>
<serialNumber>2.1</serialNumber>
<serialNumber>2.2</serialNumber>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<UPC>Linux IGD</UPC>
<serviceList>
@@ -59,9 +59,9 @@
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelDescription>Internet connection on Linux IPFire Firewall</modelDescription>
<modelName>IPFire</modelName>
<modelNumber>2.1</modelNumber>
<modelNumber>2.2</modelNumber>
<modelURL>http://www.ipfire.org</modelURL>
<serialNumber>2.1</serialNumber>
<serialNumber>2.2</serialNumber>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<UPC>Linux IGD</UPC>
<serviceList>

View File

@@ -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.1';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.2';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'share';
$sambasettings{'OSLEVEL'} = '33';

View File

@@ -24,8 +24,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.2-test"
GIT_BRANCH=rspezial:rspezial # Version number
VERSION="2.2"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level