From a3ab44f29b9a02e9167fef1e13fa21987a9430ae Mon Sep 17 00:00:00 2001
From: Robert Bays <rbays@cartagena.vyatta.com>
Date: Wed, 10 Sep 2008 16:19:01 -0400
Subject: fixes to install-system and grub-setup for xen hypervisor and
 device.map

---
 scripts/grub-setup     | 2 +-
 scripts/install-system | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/grub-setup b/scripts/grub-setup
index cfa9fecc..b5f30647 100755
--- a/scripts/grub-setup
+++ b/scripts/grub-setup
@@ -75,7 +75,7 @@ vga_logo="vga=785"
 
   # get xen kernel info
   xen_kernel_version=$(ls $ROOTFSDIR/boot/vmlinuz*xen 2> /dev/null | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r)
-  xen_version=$(ls $ROOTFSDIR/boot/ | awk -F/ '{ print $5 }' | grep xen- | sort -r)
+  xen_version=$(ls $ROOTFSDIR/boot/xen-* | awk -F/ '{ print $5 }' | sort -r)
 
   # Figure out whether we are running on the serial or KVM console:
   if [ "`tty`" == "/dev/ttyS0" ]; then
diff --git a/scripts/install-system b/scripts/install-system
index 978627c9..8cca9a56 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -850,7 +850,7 @@ install_grub () {
 
   # Install grub in the boot sector of the primary drive
   progress_indicator start
-  grub-install --no-floppy --root-directory=$rootfsdir /dev/$INSTALL_DRIVE >>$INSTALL_LOG 2>&1
+  grub-install --no-floppy --recheck --root-directory=$rootfsdir /dev/$INSTALL_DRIVE >>$INSTALL_LOG 2>&1
   progress_indicator stop
 
   # Assume no dma if the disk is smaller than 10G (such as a CF drive)
@@ -875,7 +875,7 @@ install_grub () {
   if eval "$UNION"; then
     grub_args="-u"
   fi
-  if /opt/vyatta/sbin/grub-setup $grub_args "$ROOT_PARTITION" "$grub_options" /mnt/rootfs $UNION >>$INSTALL_LOG
+  if /opt/vyatta/sbin/grub-setup $grub_args "$ROOT_PARTITION" "$grub_options" /mnt/rootfs >>$INSTALL_LOG
   then
     echo "OK"
   else
-- 
cgit v1.2.3