From 80ada95edf77deeeb50cc79e9305d4404e9aca7f Mon Sep 17 00:00:00 2001 From: Arne Fitzennreiter Date: Sat, 25 Oct 2008 17:44:03 +0200 Subject: [PATCH] Marked als 2.3rc1 / core 21 --- config/rootfiles/cdrom_corever | 2 +- config/rootfiles/updater/update.sh | 2 +- lfs/updater | 8 ++++---- make.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever index 209e3ef4b6..aabe6ec390 100644 --- 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 0e4f7e4305..d049666330 100755 --- 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 611c7398d2..74603d3ca2 100644 --- 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 4cc666c617..edab59a747 100755 --- 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 -- 2.39.5