This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 3069380c4189a1d875717441d88082286a85586b (commit) via 77350828e8b6e056ce08845e763d2cd9e47ea637 (commit) via 9f73293568ebec9c51961b39619c0c01663dec96 (commit) via d2f0bae8cb5af8e8f7557aa5a40759932d2c87e8 (commit) from a9300d08658dad8849b3882f98cc77cc45130d74 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3069380c4189a1d875717441d88082286a85586b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 19 11:11:08 2018 +0200
installer: update number of files
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 77350828e8b6e056ce08845e763d2cd9e47ea637 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 19 11:04:27 2018 +0200
finish core122
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9f73293568ebec9c51961b39619c0c01663dec96 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 19 11:02:51 2018 +0200
core122: run sensors-detect with new kernel
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d2f0bae8cb5af8e8f7557aa5a40759932d2c87e8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 19 10:58:47 2018 +0200
core121/122: update needed diskspace
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/121/update.sh | 18 ++++++++++++++++++ config/rootfiles/core/122/update.sh | 3 ++- make.sh | 2 +- src/installer/main.c | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index 4d19e48f5..18019c1d7 100644 --- a/config/rootfiles/core/121/update.sh +++ b/config/rootfiles/core/121/update.sh @@ -41,6 +41,23 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done
+# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 220000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi
# Stop services
@@ -95,3 +112,4 @@ sync
# Don't report the exitcode last command exit 0 + diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh index 925886e27..3e8cab693 100644 --- a/config/rootfiles/core/122/update.sh +++ b/config/rootfiles/core/122/update.sh @@ -61,7 +61,7 @@ esac # Check diskspace on root ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-if [ $ROOTSPACE -lt 100000 ]; then +if [ $ROOTSPACE -lt 80000 ]; then exit_with_error "ERROR cannot update because not enough free space on root." 2 exit 2 fi @@ -77,6 +77,7 @@ rm -rf /boot/zImage-ipfire-* rm -rf /boot/uInit-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors
# Stop services
diff --git a/make.sh b/make.sh index d9752756a..b03bd77e4 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number CORE="122" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +PAKFIRE_CORE="122" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/installer/main.c b/src/installer/main.c index 116f52b05..5572a4da4 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -23,7 +23,7 @@ #include <libintl.h> #define _(x) dgettext("installer", x)
-#define INST_FILECOUNT 21000 +#define INST_FILECOUNT 24800 #define LICENSE_FILE "/cdrom/COPYING" #define SOURCE_TEMPFILE "/tmp/downloads/image.iso"
hooks/post-receive -- IPFire 2.x development tree