[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87dfe754a22f9dc2bb3ddac0a5af6d7214a27e17

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3110 bytes --]

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, next has been updated
       via  87dfe754a22f9dc2bb3ddac0a5af6d7214a27e17 (commit)
       via  efc4a15600298bb987e40562932196fc65844a56 (commit)
      from  ac924baf924906b77353c03690c047183c363bfa (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 87dfe754a22f9dc2bb3ddac0a5af6d7214a27e17
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 25 15:28:06 2020 +0000

    core141: check free space on root
    
    also force fsck at next boot to free the journal on xfs partitions.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit efc4a15600298bb987e40562932196fc65844a56
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 25 15:16:12 2020 +0000

    core140: don't system-release and co
    
    This files contain version 141 because there is no extra build
    so don't pak it into the updater to prevent wrong display in webgui
    if core141 fails because there is not enough diskspace.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/140/filelists/files | 4 ----
 config/rootfiles/core/141/update.sh       | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 4418d8bf3..04b974885 100644
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -1,5 +1 @@
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-#var/ipfire/langs
 usr/local/bin/filesystem-cleanup
diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/core/141/update.sh
index 86ee7cefc..305972e18 100644
--- a/config/rootfiles/core/141/update.sh
+++ b/config/rootfiles/core/141/update.sh
@@ -29,6 +29,8 @@ core=141
 exit_with_error() {
 	# Set last succesfull installed core.
 	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# force fsck at next boot, this may fix free space on xfs
+	touch /forcefsck
 	# don't start pakfire again at error
 	killall -KILL pak_update
 	/usr/bin/logger -p syslog.emerg -t ipfire \
@@ -41,6 +43,12 @@ for (( i=1; i<=$core; i++ )); do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 180000 ]; then
+	exit_with_error "ERROR cannot update because not enough free space on root." 2
+fi
 
 # Remove files
 rm -f /etc/rc.d/init.d/networking/red.up/06-safe-search


hooks/post-receive
--
IPFire 2.x development tree