Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-grub2
Commits
070e1903
Commit
070e1903
authored
Feb 26, 2016
by
Vladimir Serbinenko
Browse files
Use console rather than serial_efi0 on arm64-efi in tests
parent
109189ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/util/grub-shell.in
View file @
070e1903
...
...
@@ -74,6 +74,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
disk
=
0
# To skip "Welcome to GRUB" and color setttings
trim
=
1
serial_port
=
;;
powerpc-ieee1275
)
boot
=
hd
...
...
@@ -181,7 +182,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
trim
=
1
qemuopts
=
"-machine virt -cpu cortex-a57 -bios /usr/share/qemu-efi/QEMU_EFI.fd
$qemuopts
"
disk
=
"device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
serial_port
=
efi0
serial_port
=
;;
arm-efi
)
qemu
=
qemu-system-arm
...
...
@@ -322,7 +323,7 @@ fi
if
[
"
${
grub_modinfo_target_cpu
}
-
${
grub_modinfo_platform
}
"
=
powerpc-ieee1275
]
;
then
echo
insmod escc
>>
${
cfgfile
}
fi
if
[
"
${
grub_modinfo_platf
or
m
}
"
!=
emu
]
;
then
if
[
"
${
serial_p
or
t
}
"
!=
""
]
;
then
echo
"serial
${
serial_port
}
"
>>
${
cfgfile
}
term
=
"serial_
${
serial_port
}
"
else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment