xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-28 04:58:19 +00:00
Code Issues Releases Wiki Activity

Update getinstdisk to better handle M.2/ahci devices

Browse Source
This commit is contained in:
Jarrod Johnson
2018-03-02 15:42:15 -05:00
parent 10090a9dc8
commit 08c29357bf
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/share/xcat/install/scripts/getinstdisk
View File

@@ -149,14 +149,22 @@ if [ -z "$install_disk" ]; then
disk_path=$(echo $output_for_path | $utolcmd)
disk_driver=$(udevadm info --attribute-walk --name=$disk | grep DRIVERS| grep -v '""'| grep -v '"sd"'|
\head -n 1| sed -e 's/[^"]*"//' -e 's/"//' | $utolcmd)
disk_model=$(udevadm info --attribute-walk --name=$disk | grep {model}|sed -e 's/[^"]*"//' -e 's/"//' -e 's/ *$//'| $utolcmd)
echo "[get_install_disk]The disk $disk information: "
echo "[get_install_disk] disk_wwn=$disk_wwn"
echo "[get_install_disk] disk_path=$disk_path"
echo "[get_install_disk] disk_driver=$disk_driver"
# Check whether there is WWN, PATH information
if [ "$disk_wwn" ]; then
if [ "$disk_model" == "thinksystem m.2" ]; then
echo "$disk $disk_data" > "$tmpfile""$file_pre""firstchoicedisks"
echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre firstchoicedisks"
break # M.2 raid modules are the OS install targets
elif [ "$disk_driver" == "ahci" ]; then
echo "$disk $disk_data" >> "$tmpfile""$file_pre""firstchoicedisks"
echo "[get_install_disk] Add disk: $disk $disk_data into $file_pre firstchoicedisks"
continue
elif [ "$disk_wwn" ]; then
has_wwn=1
file_pre="wwn"
disk_data=$disk_wwn