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 eff5c1d30c0a451991478f6732d66fa598c1a170 (commit) via 738e90f637d049db26544aa36f1fb07c89253e70 (commit) from 79f8faa733ae27edebd39b185376c482b734dff0 (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 eff5c1d30c0a451991478f6732d66fa598c1a170 Merge: 738e90f 79f8faa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 16 13:41:34 2011 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 738e90f637d049db26544aa36f1fb07c89253e70 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 16 13:39:36 2011 +0100

Xen-Kernel: fix default entry for latest installed kernel.

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

Summary of changes: src/paks/linux-xen/install.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

Difference in files: diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index f0be273..80234d0 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -62,7 +62,7 @@ uname -r | grep "ipfire-xen"; if [ ${?} = 0 ]; then #Xen Kernel is active #Set grub default entry to this kernel - sed -i -e "s|^default saved|default $ENTRY|g" /boot/grub/grub.conf + sed -i -e "s|^default .*|default $ENTRY|g" /boot/grub/grub.conf #Remove ramdisk of normal kernel (not enough space) rm -f /boot/ipfirerd-$KVER.img else

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