rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Fix a bug where booting from ISO on kvm

Browse Source 
1. Use '-boot -c' for hard disk first
2. Remove duplicated kernel boot params
This commit is contained in:
niusmallnan
2019-05-14 15:43:24 +08:00
parent 470c686bbc
commit 91955249ef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/global.cfg
View File

@@ -1 +1 @@
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on panic=10 ${APPEND} APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on panic=10 ${APPEND}

2
scripts/run
View File

@@ -336,7 +336,7 @@ if [ "$QEMU" == "1" ]; then
elif [ "$BOOT_ISO" == "1" ] || elif [ "$BOOT_ISO" == "1" ] ||
[ "$BOOT_HD" == "1" ]; then [ "$BOOT_HD" == "1" ]; then
if [ "$BOOT_ISO" == "1" ]; then if [ "$BOOT_ISO" == "1" ]; then
ISO_OPTS="-boot d -cdrom ./dist/artifacts/rancheros.iso \ ISO_OPTS="-boot c -cdrom ./dist/artifacts/rancheros.iso \
-fsdev local,security_model=none,id=fsdev1,path=${HOME} \ -fsdev local,security_model=none,id=fsdev1,path=${HOME} \
-device virtio-9p-pci,id=fs1,fsdev=fsdev1,mount_tag=home " -device virtio-9p-pci,id=fs1,fsdev=fsdev1,mount_tag=home "
echo "----- $ISO_OPTS" echo "----- $ISO_OPTS"