diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-07 17:07:25 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-07 17:07:25 -0700 |
| commit | f7798694b590a0fee79790cc482d688e095cec5b (patch) | |
| tree | 5bd7fa83804db604c5b15d4dabbc9375a0bdd4f2 /scripts/install-system | |
| parent | e5c331a28b6ac6e30925dfea8827bd5ce3f1c816 (diff) | |
| download | vyatta-cfg-system-f7798694b590a0fee79790cc482d688e095cec5b.tar.gz vyatta-cfg-system-f7798694b590a0fee79790cc482d688e095cec5b.zip | |
Don't add ide=nodma twice
Since the drive sizing can be called twice, don't add duplicate
entry to GRUB OPTIONS
Diffstat (limited to 'scripts/install-system')
| -rwxr-xr-x | scripts/install-system | 2 |
1 files changed, 1 insertions, 1 deletions
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 |