[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c030bfba2e5aac576139362134f9c1cb
From:       Arne Fitzenreiter <git () ipfire ! org>
Date:       2018-12-07 20:19:34
Message-ID: 20181207201934.9DD0E84FDD4 () people01 ! i ! ipfire ! org
[Download RAW message or body]

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  c030bfba2e5aac576139362134f9c1cb59bc9730 (commit)
      from  d05fe8e3e55f1da22ad56ca8ac68b993ff715d05 (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 c030bfba2e5aac576139362134f9c1cb59bc9730
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date:   Fri Dec 7 21:16:43 2018 +0100

    core126: fix "need reboot display"
    
    The display should displayed always except the linux-pae
    packages is planned to be installed after this update.
    
    Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/126/update.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/126/update.sh b/config/rootfiles/core/126/update.sh
index 938732b4a..8ada3f4cb 100644
--- a/config/rootfiles/core/126/update.sh
+++ b/config/rootfiles/core/126/update.sh
@@ -116,20 +116,22 @@ case "$(uname -m)" in
 			if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
 				/usr/bin/logger -p syslog.emerg -t ipfire \
 				"core-update-${core}: WARNING not enough space for pae kernel."
+				touch /var/run/need_reboot
 			else
 				echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
 				echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
 				echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
 			fi
+		else
+			touch /var/run/need_reboot
 		fi
 		;;
+	*)
+		# This update needs a reboot...
+		touch /var/run/need_reboot
+		;;
 esac
 
-# This update needs a reboot...
-if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then
-	touch /var/run/need_reboot
-fi
-
 # Finish
 /etc/init.d/fireinfo start
 sendprofile


hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]