]> xenbits.xensource.com Git - raisin.git/commitdiff
Use update-grub and grub2-mkconfig to update grub config
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 20 Mar 2015 17:18:18 +0000 (17:18 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 20 Mar 2015 17:22:29 +0000 (17:22 +0000)
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
xen.sh

diff --git a/xen.sh b/xen.sh
index 8e7b143356f16c3e1cc804bd9b71d220777400fe..d4969ec12ccd0b1f3b5b1da6a13ca18c03f4e40a 100644 (file)
--- a/xen.sh
+++ b/xen.sh
@@ -15,7 +15,7 @@ function xen_install_dependencies() {
 
     local DEP_Fedora_common="make gcc python-devel gettext libuuid-devel   \
              ncurses-devel glib2-devel libaio-devel openssl-devel yajl-devel   \
-             patch pixman-devel glibc-devel bridge-utils"
+             patch pixman-devel glibc-devel bridge-utils grub2"
     local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 iasl texinfo"
     local DEP_Fedora_x86_64="$DEP_Fedora_x86_32 glibc-devel.i686"
 
@@ -103,15 +103,11 @@ function xen_create_bridge_Fedora() {
 }
 
 function xen_update_bootloader_Debian() {
-    grub-mkconfig
+    $SUDO update-grub
 }
 
 function xen_update_bootloader_Fedora() {
-    TMPFILE=`mktemp`
-    cat /boot/grub/grub.conf | \
-      sed -e 's,kernel,multiboot /boot/xen.gz placeholder\n\tmodule,g' | \
-      sed -e 's/initrd/module/g' > $TMPFILE
-    $SUDO mv -f $TMPFILE /boot/grub/grub.conf
+    $SUDO grub2-mkconfig -o /boot/grub2/grub.cfg
 }
 
 function xen_configure() {