Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
anbox
提交
a21233cb
A
anbox
项目概览
openeuler
/
anbox
通知
24
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
anbox
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a21233cb
编写于
5月 11, 2017
作者:
S
Simon Fels
提交者:
GitHub
5月 11, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #252 from morphis/f/warn-on-cm-start
Print warning if user starts container manager manually
上级
5c1418b8
e83cc1e5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
3 deletion
+16
-3
scripts/container-manager.sh
scripts/container-manager.sh
+2
-1
src/anbox/cmds/container_manager.cpp
src/anbox/cmds/container_manager.cpp
+13
-2
src/anbox/cmds/container_manager.h
src/anbox/cmds/container_manager.h
+1
-0
未找到文件。
scripts/container-manager.sh
浏览文件 @
a21233cb
...
...
@@ -37,7 +37,8 @@ start() {
exec
$AA_EXEC
$SNAP
/bin/anbox-wrapper.sh container-manager
\
--data-path
=
$DATA_PATH
\
--android-image
=
$ANDROID_IMG
--android-image
=
$ANDROID_IMG
\
--daemon
}
stop
()
{
...
...
src/anbox/cmds/container_manager.cpp
浏览文件 @
a21233cb
...
...
@@ -48,11 +48,22 @@ anbox::cmds::ContainerManager::ContainerManager()
flag
(
cli
::
make_flag
(
cli
::
Name
{
"privileged"
},
cli
::
Description
{
"Run Android container in privileged mode"
},
privileged_
));
flag
(
cli
::
make_flag
(
cli
::
Name
{
"daemon"
},
cli
::
Description
{
"Mark service as being started as systemd daemon"
},
daemon_
));
action
([
&
](
const
cli
::
Command
::
Context
&
)
{
try
{
if
(
getuid
()
!=
0
)
{
ERROR
(
"You're not running the container-manager as root. Generally you don't"
);
if
(
!
daemon_
)
{
WARNING
(
"You are running the container manager manually which is most likely not"
);
WARNING
(
"what you want. The container manager is normally started by systemd or"
);
WARNING
(
"another init system. If you still want to run the container-manager"
);
WARNING
(
"you can get rid of this warning by starting with the --daemon option."
);
WARNING
(
""
);
}
if
(
geteuid
()
!=
0
)
{
ERROR
(
"You are not running the container-manager as root. Generally you don't"
);
ERROR
(
"want to run the container-manager manually unless you're a developer"
);
ERROR
(
"as it is started by the init system of your operating system."
);
return
EXIT_FAILURE
;
...
...
src/anbox/cmds/container_manager.h
浏览文件 @
a21233cb
...
...
@@ -42,6 +42,7 @@ class ContainerManager : public cli::CommandWithFlagsAndAction {
std
::
shared_ptr
<
common
::
LoopDevice
>
android_img_loop_dev_
;
std
::
vector
<
std
::
shared_ptr
<
common
::
MountEntry
>>
mounts_
;
bool
privileged_
=
false
;
bool
daemon_
=
false
;
};
}
// namespace cmds
}
// namespace anbox
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录