change version to beta4 / core19

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index 0cd525d8cbc1b86849e7b401e0e185fe1bf5d95b..d6b24041cf04154f8f902651969675021f4d93a5 100644 (file)
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1,2 +1 @@
-18
-
+19

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index b16a0968d42ab8bf080327a02beca92415ec962b..b22b6cd799ca7d56119aaf7195d1e3a621d44c2c 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -235,7 +235,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-18 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-19 "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 5df5222c5062026db9e846a323f8daddc1b21cae..f743730001e01ec00f8c542e3fd48c2076342993 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-18.ipfire \
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-19.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/18/g" \
+               -e "s/RELEASE/19/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-18.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-18
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-19.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-19

diff --git a/make.sh b/make.sh
index 1dce1ecb0b960ca3a367d3a24f9a02920cbd77ee..31a1e13c0cea5254fc61405c04d4c4877dfe8628 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-beta4"
 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 6be63bf0eaf598a6783ad40ddb896a9aa1780400..ca3f42e18b5367ccc90f80d9ae72dd547da2d339 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # FIXME: edit this lines before release
-#URL=http://download.ipfire.org/iso/
-#ISO=ipfire-2.3-beta4.i586-full.iso
-URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
-ISO=ipfire-2.3-test.i586-full.iso
+URL=http://download.ipfire.org/iso/
+ISO=ipfire-2.3-beta4.i586-full.iso
+#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
+#ISO=ipfire-2.3-test.i586-full.iso
 
 if [ -z "$1" ]; then 
        echo usage: $0 backup-file