]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Fix linux-xen install/uninstall for updating ct'server.
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Jun 2010 21:41:36 +0000 (23:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Jun 2010 21:41:36 +0000 (23:41 +0200)
lfs/linux
src/paks/linux-xen/install.sh
src/paks/linux-xen/uninstall.sh

index b77c560c11d3af70dfbf45d6f034b17e59ff1272..cf609f20bb4e85fd48e540d85c71b9773436d427 100644 (file)
--- 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.
index d6ad9f14644737671f3f4ddb94bdac9fa2f6872d..eb2285b1e026d5d6fe612e0b7ad3bc625e8ff50f 100644 (file)
@@ -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"
index ca65ef7c47b420d20bd0a90d77b4c546b3f59c3d..fe2316566e615cab27aec842e15e307a1b005fbf 100644 (file)
 # 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