xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-21 05:25:32 +00:00
Code Issues Releases Wiki Activity

Fix issue #1048, Resolve or clean up minor issues on getinstdisk from code review

Browse Source
This commit is contained in:
XuWei
2016-05-06 02:24:35 -04:00
parent e9f1c4b39c
commit 3d0fdc94c1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ has_awk=$(find /usr/* -name "awk")
utolcmd="sed -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
tmpfile=$tmpdir"/getinstalldisk_"
tmpfile="$tmpdir/getinstalldisk_"
if [ -z "$install_disk" ]; then
@ -107,7 +107,7 @@ if [ -z "$install_disk" ]; then
break
done
umount $mount_dir || echo "[get_install_disk] $partition umount failed."
umount -l $mount_dir || echo "[get_install_disk] $partition umount failed."
else
echo "[get_install_disk] Partition $partition mount failed or the partition is swap."
fi
@ -122,8 +122,11 @@ if [ -z "$install_disk" ]; then
fi
rmdir $mount_dir;
rm $tmpfile*;
for file in $tmpfile*; do
rm $file;
done
has_wwn=0
has_path=0
file_pre=""
@ -194,8 +197,11 @@ if [ -z "$install_disk" ]; then
if [ "$install_file" ] && [ -s $install_file ]; then
install_disk=/dev/$(cat $install_file | grep -v "^$" | sort -k 2 -b | cut -d " " -f1 | head -n 1)
echo "[get_install_disk]The install_disk is $install_disk by sorting $file_pre and DRIVER."
fi
rm $tmpfile*;
fi
for file in $tmpfile*; do
rm $file;
done
fi
rm -rf $tmpdir;