From 70502da8b705c0bf9b4ac68012e202c33c52505c Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Mon, 25 Jan 2016 23:32:18 +0300 Subject: [PATCH] Restore forgotten kernel name for VirtualBox This commit adds forgotten kernel name back to boot Fuel using VirtualBox scripts with skipfuelmenu="yes" set. Change-Id: I58e21558024c3974dab8af6cefa141bf270fb065 Closes-Bug: #1537897 Closes-Bug: #1487047 Related-Bug: #1525967 --- actions/master-node-create-and-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/master-node-create-and-install.sh b/actions/master-node-create-and-install.sh index c940536..a7b7f6e 100755 --- a/actions/master-node-create-and-install.sh +++ b/actions/master-node-create-and-install.sh @@ -50,9 +50,9 @@ if [ ${headless} -eq 1 ]; then fi if [ "${skipfuelmenu}" = "yes" ]; then - cmdline="$(grep 'append initrd' ../iso/isolinux/isolinux.cfg -m1 2> /dev/null | sed -e 's/^[ ]*append//')" - cmdline="${cmdline:- initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 selinux=0}" - boot_line="$(translate "$cmdline showmenu=no"$'\n')" + cmdline="$(grep 'append initrd' ../iso/isolinux/isolinux.cfg -m1 2>/dev/null | sed -e 's/^[ ]*append[ ]*//')" + cmdline="${cmdline:-initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 selinux=0}" + boot_line="$(translate " vmlinuz $cmdline showmenu=no"$'\n')" fi # Start virtual machine with the master node