From a98cb37cedb92cc236b0b555aeedae534a082f15 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 2 Feb 2018 14:12:33 -0500 Subject: [PATCH] Give priority to likely boot volumes when mixed with raid controller A common configuration is an ahci attached boot device. Prefer ahci over megaraid as a result. --- xCAT-server/share/xcat/install/scripts/getinstdisk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/getinstdisk b/xCAT-server/share/xcat/install/scripts/getinstdisk index 20c64f426..615d316e2 100644 --- a/xCAT-server/share/xcat/install/scripts/getinstdisk +++ b/xCAT-server/share/xcat/install/scripts/getinstdisk @@ -179,22 +179,26 @@ if [ -z "$install_disk" ]; then # Sort disks by DRIVER type case "$disk_driver" in - "ata_piix"*|"PMC MaxRAID"|"ahci"|"megaraid_sas") + "ata_piix"*|"ahci") echo "$disk $disk_data" >> "$tmpfile""$file_pre""firstchoicedisks" echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre firstchoicedisks" ;; - "mptsas"|"mpt2sas"|"mpt3sas") + "PMC MaxRAID"|"megaraid_sas") echo "$disk $disk_data" >> "$tmpfile""$file_pre""secondchoicedisks" echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre secondchoicedisks" ;; - *) + "mptsas"|"mpt2sas"|"mpt3sas") echo "$disk $disk_data" >> "$tmpfile""$file_pre""thirdchoicedisks" echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre thirdchoicedisks" ;; + *) + echo "$disk $disk_data" >> "$tmpfile""$file_pre""fourthchoicedisks" + echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre fourthchoicedisks" + ;; esac done - for seq in first second third; do + for seq in first second third fourth; do if [ -s $tmpfile$file_pre${seq}choicedisks ]; then install_file="$tmpfile$file_pre${seq}choicedisks" break