From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f61b838fb0842bf76e7cf12f3eaa6e86bfd275be
Date: Fri, 06 May 2016 14:57:12 +0100 [thread overview]
Message-ID: <20160506135713.3684A1078E81@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2530 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 f61b838fb0842bf76e7cf12f3eaa6e86bfd275be (commit)
from 4558108c4d1ed68b7f47287239b529b0cf909109 (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 f61b838fb0842bf76e7cf12f3eaa6e86bfd275be
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri May 6 15:16:12 2016 +0200
linux-pae: prevent install on non pae systems
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
src/paks/linux-pae/install.sh | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 58a9c1c..ef271f3 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2014 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2016 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -42,6 +42,13 @@ function find_partition() {
return 0
}
+if [ "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ rm -f /opt/pakfire/db/instelled/meta-linux-pae
+ /usr/bin/logger -p syslog.emerg -i pakfire \
+ "linux-pae: no pae support found, aborted!"
+ exit 1
+fi
+
extract_files
#
KVER=xxxKVERxxx
@@ -75,8 +82,6 @@ else
ln -s grub.conf $MNThdd/boot/grub/menu.lst
fi
-# request a reboot if pae is supported
-if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
- touch /var/run/need_reboot
-fi
+# request a reboot
+touch /var/run/need_reboot
sync && sync
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-05-06 13:57 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=20160506135713.3684A1078E81@git01.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