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 8c065b268d8c04c48e76dde8109381823a601908 (commit) via 2e51e8607e3b45b41a984f95c81c257a41107cff (commit) from 1ffbca6e4f3fdb0fbde2e725ba066877cb7f909e (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 8c065b268d8c04c48e76dde8109381823a601908 Merge: 2e51e86 1ffbca6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 17 22:01:56 2016 +0100

Merge branch 'core98' of git.ipfire.org:/pub/git/ipfire-2.x into core98

commit 2e51e8607e3b45b41a984f95c81c257a41107cff Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 17 21:57:00 2016 +0100

core98: remove wrong grub.cfg only if it was empty.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

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

Summary of changes: config/rootfiles/core/98/update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/core/98/update.sh b/config/rootfiles/core/98/update.sh index ec9c1aa..89d3245 100644 --- a/config/rootfiles/core/98/update.sh +++ b/config/rootfiles/core/98/update.sh @@ -39,7 +39,10 @@ extract_files # Bugfixes for core96 updater bugs... if [ -e /boot/grub/grub.conf ]; then # legacy grub config on xen or citrix conflicts with grub2 config - rm /boot/grub/grub.cfg + # and core96 contains an empty file + if [ ! -s /boot/grub/grub.cfg ] + rm /boot/grub/grub.cfg + fi fi

if [ -e /boot/grub/grub.cfg ]; then

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