From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 db5b0f969331bcc3945b32a4595b8484da1dc8fb
Date: Mon, 02 Feb 2015 13:26:24 +0100
Message-ID: <20150202122624.AA21721831@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4364784226233182046=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============4364784226233182046==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  db5b0f969331bcc3945b32a4595b8484da1dc8fb (commit)
      from  976a7b26bfbb556d947444d53933feb9cf0febee (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 db5b0f969331bcc3945b32a4595b8484da1dc8fb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Feb 2 10:58:19 2015 +0100

    core87: fix stay on serial console at update.

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

Summary of changes:
 config/rootfiles/core/86/update.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/up=
date.sh
index 8a820e2..5a7b59a 100644
--- a/config/rootfiles/core/86/update.sh
+++ b/config/rootfiles/core/86/update.sh
@@ -83,8 +83,16 @@ rm -rf /lib/modules
=20
 case "$(uname -m)" in
 	i?86)
-		# Backup grub.conf
-		cp -vf /boot/grub/grub.conf /boot/grub-legacy.conf
+		# Backup old grub config
+		if [ -f /boot/grub/grub.conf ]; then
+			cp -vf /boot/grub/grub.conf /boot/old-grub-config
+		fi
+		if [ -f /boot/grub/menu.lst ]; then
+			cp -vf /boot/grub/menu.lst /boot/old-grub-config
+		fi
+		if [ -f /boot/grub/grub.cfg ]; then
+			cp -vf /boot/grub/grub.cfg /boot/old-grub-config
+		fi
=20
 		# Remove all files that belong to GRUB-legacy
 		rm -rfv /boot/grub
@@ -162,7 +170,7 @@ case "$(uname -m)" in
 		#
 		echo
 		echo Update grub configuration ...
-		if grep -qE "^serial" /boot/grub-legacy.conf; then
+		if grep -qE "^serial" /boot/old-grub-config; then
 			sed -i /etc/default/grub \
 				-e "s| panic=3D10 | console=3DttyS0,115200n8 panic=3D10 |g"
 			echo "GRUB_TERMINAL=3D\"serial\"" >> /etc/default/grub


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

--===============4364784226233182046==--