Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
anbox
提交
f6e421a0
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,发现更多精彩内容 >>
提交
f6e421a0
编写于
7月 12, 2017
作者:
S
Simon Fels
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support to mount rootfs image via squashfuse
上级
aecf88fb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
56 addition
and
18 deletion
+56
-18
src/anbox/cmds/container_manager.cpp
src/anbox/cmds/container_manager.cpp
+56
-18
未找到文件。
src/anbox/cmds/container_manager.cpp
浏览文件 @
f6e421a0
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#include "anbox/config.h"
#include "anbox/config.h"
#include "core/posix/signal.h"
#include "core/posix/signal.h"
#include "core/posix/exec.h"
#include <sys/mount.h>
#include <sys/mount.h>
#include <linux/loop.h>
#include <linux/loop.h>
...
@@ -121,29 +122,66 @@ bool anbox::cmds::ContainerManager::setup_mounts() {
...
@@ -121,29 +122,66 @@ bool anbox::cmds::ContainerManager::setup_mounts() {
if
(
!
fs
::
exists
(
android_rootfs_dir
))
if
(
!
fs
::
exists
(
android_rootfs_dir
))
fs
::
create_directory
(
android_rootfs_dir
);
fs
::
create_directory
(
android_rootfs_dir
);
std
::
shared_ptr
<
common
::
LoopDevice
>
loop_device
;
// We prefer using the kernel for mounting the squashfs image but
// for some cases (unprivileged containers) where no loop support
// is available we do the mount instead via squashfuse which will
// work entirely in userspace.
if
(
fs
::
exists
(
"/dev/loop-control"
))
{
std
::
shared_ptr
<
common
::
LoopDevice
>
loop_device
;
try
{
try
{
loop_device
=
common
::
LoopDeviceAllocator
::
new_device
();
loop_device
=
common
::
LoopDeviceAllocator
::
new_device
();
}
catch
(
const
std
::
exception
&
e
)
{
}
catch
(
const
std
::
exception
&
e
)
{
ERROR
(
"Could not create loopback device: %s"
,
e
.
what
());
ERROR
(
"Could not create loopback device: %s"
,
e
.
what
());
return
false
;
return
false
;
}
catch
(...)
{
}
catch
(...)
{
ERROR
(
"Could not create loopback device"
);
ERROR
(
"Could not create loopback device"
);
return
false
;
return
false
;
}
}
if
(
!
loop_device
->
attach_file
(
android_img_path
))
{
if
(
!
loop_device
->
attach_file
(
android_img_path
))
{
ERROR
(
"Failed to attach Android rootfs image to loopback device"
);
ERROR
(
"Failed to attach Android rootfs image to loopback device"
);
return
false
;
return
false
;
}
}
auto
m
=
common
::
MountEntry
::
create
(
loop_device
,
android_rootfs_dir
,
"squashfs"
,
MS_MGC_VAL
|
MS_RDONLY
|
MS_PRIVATE
);
auto
m
=
common
::
MountEntry
::
create
(
loop_device
,
android_rootfs_dir
,
"squashfs"
,
MS_MGC_VAL
|
MS_RDONLY
|
MS_PRIVATE
);
if
(
!
m
)
{
if
(
!
m
)
{
ERROR
(
"Failed to mount Android rootfs"
);
ERROR
(
"Failed to mount Android rootfs"
);
return
false
;
}
mounts_
.
push_back
(
m
);
}
else
if
(
fs
::
exists
(
"/dev/fuse"
)
&&
!
utils
::
find_program_on_path
(
"squashfuse"
).
empty
())
{
std
::
vector
<
std
::
string
>
args
=
{
"-t"
,
"fuse.squashfuse"
,
// Allow other users than root to access the rootfs
"-o"
,
"allow_other"
,
android_img_path
.
string
(),
android_rootfs_dir
,
};
// Easiest is here to go with the standard mount program as that
// will handle everything for us which is relevant to get the
// squashfs via squashfuse properly mount without having to
// reimplement all the details. Once the mount call comes back
// without an error we can expect the image to be mounted.
auto
child
=
core
::
posix
::
exec
(
"/bin/mount"
,
args
,
{},
core
::
posix
::
StandardStream
::
empty
,
[]()
{});
const
auto
result
=
child
.
wait_for
(
core
::
posix
::
wait
::
Flags
::
untraced
);
if
(
result
.
status
!=
core
::
posix
::
wait
::
Result
::
Status
::
exited
||
result
.
detail
.
if_exited
.
status
!=
core
::
posix
::
exit
::
Status
::
success
)
{
ERROR
(
"Failed to mount squashfs Android image"
);
return
false
;
}
auto
m
=
common
::
MountEntry
::
create
(
android_rootfs_dir
);
if
(
!
m
)
{
ERROR
(
"Failed to create mount entry for Android rootfs"
);
return
false
;
}
mounts_
.
push_back
(
m
);
}
else
{
ERROR
(
"No loop device or FUSE support found. Can't setup Android rootfs!"
);
return
false
;
return
false
;
}
}
mounts_
.
push_back
(
m
);
for
(
const
auto
&
dir_name
:
std
::
vector
<
std
::
string
>
{
"cache"
,
"data"
})
{
for
(
const
auto
&
dir_name
:
std
::
vector
<
std
::
string
>
{
"cache"
,
"data"
})
{
auto
target_dir_path
=
fs
::
path
(
android_rootfs_dir
)
/
dir_name
;
auto
target_dir_path
=
fs
::
path
(
android_rootfs_dir
)
/
dir_name
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录