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 b6785f2ef8bce570e6db66add579a2a89ee1ec78 (commit) from 5111b6c08b568300c50cb3079ed7d8b6976e17e1 (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 b6785f2ef8bce570e6db66add579a2a89ee1ec78 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jun 7 23:41:36 2010 +0200

Fix linux-xen install/uninstall for updating ct'server.

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

Summary of changes: lfs/linux | 2 +- src/paks/linux-xen/install.sh | 4 +++- src/paks/linux-xen/uninstall.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)

Difference in files: diff --git a/lfs/linux b/lfs/linux index b77c560..cf609f2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS =

PROG = linux-xen -PAK_VER = 9 +PAK_VER = 10 DEPS = ""

# Normal build or XEN build. diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index d6ad9f1..eb2285b 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/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 IPFire-Team info@ipfire.org. # +# Copyright (C) 2010 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -54,6 +54,8 @@ 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 + #Remove ramdisk of normal kernel (not enough space) + rm -f /boot/ipfirerd-$KVER.img else #Normal Kernel #pygrub crash with "default saved" diff --git a/src/paks/linux-xen/uninstall.sh b/src/paks/linux-xen/uninstall.sh index ca65ef7..fe23165 100644 --- a/src/paks/linux-xen/uninstall.sh +++ b/src/paks/linux-xen/uninstall.sh @@ -17,10 +17,10 @@ # 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 IPFire-Team info@ipfire.org. # +# Copyright (C) 2010 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh remove_files -mv -f /boot/grub/grub-backup-2.6.32.*.-xen.conf /boot/grub/grub.conf +mv -f /boot/grub/grub-backup-2.6.32.*-xen.conf /boot/grub/grub.conf

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