From f7798694b590a0fee79790cc482d688e095cec5b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 7 Jul 2008 17:07:25 -0700
Subject: Don't add ide=nodma twice

Since the drive sizing can be called twice, don't add duplicate
entry to GRUB OPTIONS
---
 scripts/install-system | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install-system b/scripts/install-system
index a7a0b066..d6ea9b74 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -229,7 +229,7 @@ select_drive () {
 
   # Assume no dma if the disk is smaller than 10G (such as a CF drive)
   size=$(get_drive_size $INSTALL_DRIVE)
-  if [ $size -lt 11000 ]
+  if [[ $size -lt 11000 && ! $GRUB_OPTIONS =~ 'ide=nodma' ]]
   then
       GRUB_OPTIONS="$GRUB_OPTIONS ide=nodma"
   fi
-- 
cgit v1.2.3