public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c030bfba2e5aac576139362134f9c1cb59bc9730
Date: Fri, 07 Dec 2018 20:19:34 +0000	[thread overview]
Message-ID: <20181207201934.9DD0E84FDD4@people01.i.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2284 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  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(a)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(a)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

                 reply	other threads:[~2018-12-07 20:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181207201934.9DD0E84FDD4@people01.i.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox