From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 7 Jun 2010 21:41:36 +0000 (+0200)
Subject: Fix linux-xen install/uninstall for updating ct'server.
X-Git-Tag: v2.9-beta1~255
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=b6785f2ef8bce570e6db66add579a2a89ee1ec78

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

diff --git a/lfs/linux b/lfs/linux
index b77c560c11..cf609f20bb 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 d6ad9f1464..eb2285b1e0 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 ca65ef7c47..fe2316566e 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