xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2547 from ocfplc/fix_configefi

Browse Source 
revert: use df instead of mount, and check for the disk that /boot is…
This commit is contained in:
zet809
2017-03-17 16:49:51 +08:00
committed by GitHub
parent 807b48bc1d 0ac134a07e
commit 65aff25a97
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT/postscripts/configefi
View File

@@ -21,7 +21,7 @@ if [ "$arch" = "x86_64" ]; then
elif [ -f "/boot/efi/EFI/redhat/grubx64.efi" ];then
efibootmgr -c -l \\EFI\\redhat\\grubx64.efi -L syscloneLinux
boot_root=`df /boot | awk '{print $1}' | tail -n 1`
boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
sed -i 's| root=\S*| root='$boot_root' net.ifnames=0|' /boot/efi/EFI/redhat/grub.cfg
blkid -c /dev/null |grep UUID|while read str_line
@@ -52,10 +52,10 @@ if [ "$arch" = "x86_64" ]; then
boot_device=''
if [ -f "/etc/systemconfig/systemconfig.conf" ];then
#boot_root=`cat /etc/systemconfig/systemconfig.conf | grep ROOTDEV | awk '{print $3}'`
boot_root=`df /boot | awk '{print $1}' | tail -n 1`
boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
boot_device=`cat /etc/systemconfig/systemconfig.conf | grep BOOTDEV | awk '{print $3}'`
else
boot_root=`df /boot | awk '{print $1}' | tail -n 1`
boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
boot_device=`echo $boot_root | sed -e 's/[0-9]*$//'`
#str_temp=`mount | awk '{print $1","$3}'`