Marked als 2.3rc1 / core 21

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index 209e3ef4b6247ce746048d5711befda46206d235..aabe6ec3909c9d4871f8f89ef88ca3b6795ebd29 100644 (file)
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1 @@
-20
+21

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 0e4f7e4305b4c5018973b146c82f845226ef1bda..d049666330490e5fd30bd7a084e0f38a747ded2d 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-20 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-21 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
 #
 chmod +x /tmp/remove_obsolete_paks
 /tmp/remove_obsolete_paks &

diff --git a/lfs/updater b/lfs/updater
index 611c7398d221c58f8ad3d5f8a42bf2fe6f392f7e..74603d3ca20f9a7a6da6c40d64183d3a7126e026 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-20.ipfire \
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-21.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/20/g" \
+               -e "s/RELEASE/21/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-20.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-20
+               -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

diff --git a/make.sh b/make.sh
index 4cc666c6175552e0b6c350f0d8f9940afb22b65f..edab59a747d6bbe6abe195bfea8cd3a7a8e155f2 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-rc1"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir