Merge branch '4.2/4900' into 'master'

[ Bug #4900 ] 适配最新的grub2软件包,更改启动配置文件存放位置

See merge request linx6.0.42/new_install!4
This commit is contained in:
张东鹏
2021-05-13 10:09:51 +08:00

View File

@@ -14,13 +14,13 @@ if [ $efimode == "y" ];then
cp -r ${efi_dir}/x86_64-efi $TARGET/boot/efi/efi/boot
cp $TARGET/boot/grub/grub.cfg $TARGET/boot/efi/efi/boot/x86_64-efi
cp $TARGET/boot/grub/grub.cfg $TARGET/boot/efi/efi/boot
#echo 'exec grub-mkconfig -o /boot/efi/efi/boot/x86_64-efi/grub.cfg $@ ' >> $TARGET/$upgrubcmd
sed -i 's/\/boot\/grub\/grub.cfg/\/boot\/efi\/efi\/boot\/x86_64-efi\/grub.cfg/' $TARGET/$upgrubcmd
sed -i 's/\/boot\/grub\/grub.cfg/\/boot\/efi\/efi\/boot\/grub.cfg/' $TARGET/$upgrubcmd
ln -snf /boot/efi/efi/boot/x86_64-efi/grub.cfg $TARGET/boot/grub/grub.cfg
ln -snf /boot/efi/efi/boot/grub.cfg $TARGET/boot/grub/grub.cfg
echo -e "Install efi successfully !"
else