Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
82beb015
T
tp-qemu
项目概览
openeuler
/
tp-qemu
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tp-qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
82beb015
编写于
7月 20, 2017
作者:
S
Sitong Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virtio_port_login: fix soft link and auto start error
Signed-off-by:
N
Sitong Liu
<
siliu@redhat.com
>
上级
052a1a18
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
9 deletion
+23
-9
qemu/tests/cfg/virtio_port_login.cfg
qemu/tests/cfg/virtio_port_login.cfg
+19
-8
qemu/tests/virtio_port_login.py
qemu/tests/virtio_port_login.py
+4
-1
未找到文件。
qemu/tests/cfg/virtio_port_login.cfg
浏览文件 @
82beb015
...
...
@@ -12,16 +12,27 @@
# Should not allow to login guest via virtio serial
login_console = vs1
pre_cmd = "grep vport0p1 /etc/securetty || echo vport0p1 >>/etc/securetty;"
pre_cmd_extra = "systemctl unmask serial-getty@vport0p1.service; systemctl enable serial-getty@vport0p1.service;"
clean_cmd = "systemctl disable serial-getty@vport0p1.service;"
RHEL.6:
pre_cmd += "sed -i '/ACTIVE_CONSOLES/c ACTIVE_CONSOLES="/dev/tty[1-6] /dev/vport0p1"' /etc/sysconfig/init;"
RHEL.7:
pre_cmd += "systemctl |grep vport0 || ln -s /usr/lib/systemd/system/serial-getty@.service /etc/systemd/system/serial-getty@vport0p1.service;"
pre_cmd += "systemctl enable serial-getty@vport0p1.service"
clean_cmd = ""
pre_cmd_extra = "sed -i '/ACTIVE_CONSOLES/c ACTIVE_CONSOLES="/dev/tty[1-6] /dev/vport0p1"' /etc/sysconfig/init;"
RHEL.7.0,RHEL.7.1:
pre_cmd_extra = "systemctl unmask serial-getty@vport0p1.service;"
pre_cmd_extra += "ln -sf /usr/lib/systemd/system/serial-getty@.service /etc/systemd/system/serial-getty@vport0p1.service;"
pre_cmd_extra += "echo -e "[Install]\nWantedBy=getty.target" >> /etc/systemd/system/serial-getty@vport0p1.service;"
pre_cmd_extra += "systemctl enable serial-getty@vport0p1.service;"
- virtio_console:
login_console = vc1
pre_cmd = "grep hvc0 /etc/securetty || echo hvc0 >> /etc/securetty;"
pre_cmd_extra = "systemctl unmask serial-getty@hvc0.service;systemctl enable serial-getty@hvc0.service;"
clean_cmd = "systemctl disable serial-getty@hvc0.service;"
RHEL.6:
pre_cmd += "sed -i '/ACTIVE_CONSOLES/c ACTIVE_CONSOLES="/dev/tty[1-6] /dev/hvc0"' /etc/sysconfig/init;"
RHEL.7:
pre_cmd += "systemctl | grep hvc0 || ln -s /usr/lib/systemd/system/serial-getty@.service /etc/systemd/system/serial-getty@hvc0.service;"
pre_cmd += "systemctl enable serial-getty@hvc0.service"
clean_cmd = ""
pre_cmd_extra = "sed -i '/ACTIVE_CONSOLES/c ACTIVE_CONSOLES="/dev/tty[1-6] /dev/hvc0"' /etc/sysconfig/init;"
RHEL.7.0,RHEL.7.1:
pre_cmd_extra = "systemctl unmask serial-getty@hvc0.service;"
pre_cmd_extra += "ln -sf /usr/lib/systemd/system/serial-getty@.service /etc/systemd/system/serial-getty@hvc0.service;"
pre_cmd_extra += "echo -e "[Install]\nWantedBy=getty.target" >> /etc/systemd/system/serial-getty@hvc0.service;"
pre_cmd_extra += "systemctl enable serial-getty@hvc0.service;"
qemu/tests/virtio_port_login.py
浏览文件 @
82beb015
...
...
@@ -25,7 +25,7 @@ class ConsoleLoginTest(utils_virtio_port.VirtioPortTest):
@
error
.
context_aware
def
pre_step
(
self
):
error
.
context
(
"Config guest and reboot it"
,
logging
.
info
)
pre_cmd
=
self
.
params
.
get
(
"pre_cmd"
)
pre_cmd
=
self
.
params
.
get
(
"pre_cmd"
)
+
self
.
params
.
get
(
"pre_cmd_extra"
)
session
=
self
.
vm
.
wait_for_login
(
timeout
=
360
)
session
.
cmd
(
pre_cmd
,
timeout
=
240
)
session
=
self
.
vm
.
reboot
(
session
=
session
,
timeout
=
900
,
serial
=
False
)
...
...
@@ -109,6 +109,9 @@ def run(test, params, env):
logging
.
info
(
"sending command: %s"
%
cmd
)
output
=
session
.
cmd_output
(
cmd
,
timeout
=
240
)
logging
.
info
(
"output:%s"
%
output
)
clean_cmd
=
params
[
"clean_cmd"
]
session
.
cmd
(
clean_cmd
,
timeout
=
180
)
session
.
close
()
except
Exception
:
console_test
.
cleanup
()
raise
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录