xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

revert to old udevadm code (#3294)

Browse Source
This commit is contained in:
Yuan Bai 2017-06-20 17:08:51 +08:00 committed by yangsong
parent d65bf34296
commit 6720675b21
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,19 +141,8 @@ if [ -z "$install_disk" ]; then
disk_wwn=$(echo $output_for_wwn | $utolcmd)
output_for_path=$(IFS= ;echo $disk_info | grep DEVPATH | cut -d "=" -f2)
disk_path=$(echo $output_for_path | $utolcmd)
# Work around the issue Pegas running on Power9 installation hang in anaconda
# with "TypeError: argument of type 'NoneType' is not iterable",
# after running of "udevadm info --attribute-walk --name=/dev/sda" in %pre section of kickstart
cpu_model=$(awk '/model/ { print $NF }' /proc/cpuinfo)
p9_bool=$(grep POWER9 /proc/cpuinfo|head -n 1|awk '{print $3}')
anaconda --version >/dev/null 2>&1
if [ $? -eq 0 ] && [ "$cpu_model" = "0000000000000000" ] && [ "$p9_bool" = "POWER9" ]; then
disk_driver=""
else
disk_driver=$(udevadm info --attribute-walk --name=$disk | grep DRIVERS| grep -v '""'| grep -v '"sd"'|
disk_driver=$(udevadm info --attribute-walk --name=$disk | grep DRIVERS| grep -v '""'| grep -v '"sd"'|
\head -n 1| sed -e 's/[^"]*"//' -e 's/"//' | $utolcmd)
fi
echo "[get_install_disk]The disk $disk information: "
echo "[get_install_disk] disk_wwn=$disk_wwn"