Marked as 2.3 Final / core 22

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index aabe6ec3909c9d4871f8f89ef88ca3b6795ebd29..2bd5a0a98a36cc08ada88b804d3be047e6aa5b8a 100644 (file)
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1 @@
-21
+22

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 3778afd7b4fe126b5317b0fe6f4efc80c7b8cd92..41e6113fc35b98753fdc816ecae22025576bac57 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -163,3 +163,4 @@ var/ipfire/wireless
 #var/ipfire/wireless/settings
 var/ipfire/xtaccess
 #var/ipfire/xtaccess/config
+var/ipfire/firebuild

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index d049666330490e5fd30bd7a084e0f38a747ded2d..e6b26d3224956226af20c7d6cbf28aa194f4f14e 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -234,7 +234,7 @@ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/remove_obsolet
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo 'logger -p syslog.emerg -t core-upgrade-21 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-22 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
 #
 chmod +x /tmp/remove_obsolete_paks
 /tmp/remove_obsolete_paks &

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b1f9f4edb389d05589ae41c79f600adbfcc3b892..e939a9cdd3c426a7f99f7e276d979e27346f6c32 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.3-test ==
+== List of softwares used to build IPFire Version: 2.3 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27

diff --git a/lfs/updater b/lfs/updater
index 74603d3ca20f9a7a6da6c40d64183d3a7126e026..2cf06aa50ef00f91af2505ab7c859bbfa7e19ea6 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh
-       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-21.ipfire \
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-22.ipfire \
                update.sh files ROOTFILES
        rm -rf /install/updater
 
        sed -e "s/NAME/core-upgrade/g" \
                -e "s/VER/2.1/g" \
-               -e "s/RELEASE/21/g" \
+               -e "s/RELEASE/22/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-21.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-21
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-22.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-22

diff --git a/make.sh b/make.sh
index 1bc721405bb49d8ccf00801f3e7e0ac51b61efaf..4359b01e0f526abd0d71db7a6dc6a4bd1de78b6a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-test"
+VERSION="2.3"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 468e1928dc0436356a76d027934c1e96f98fc10d..ba1725213a2a4b7a7f2275ccad1e973d58d93ec0 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,7 +2,7 @@
 
 # FIXME: edit this lines before release
 URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.3-rc1.i586-full.iso
+ISO=ipfire-2.3.i586-full.iso
 #URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
 #ISO=ipfire-2.3-test.i586-full.iso