Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c4d27bdd
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c4d27bdd
编写于
5月 05, 2015
作者:
C
Cole Robinson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
storage: conf: Don't output owner/group -1
-1 is just an internal placeholder and is meaningless to output in the XML.
上级
b903b3b0
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
30 addition
and
33 deletion
+30
-33
docs/schemas/storagecommon.rng
docs/schemas/storagecommon.rng
+16
-12
src/conf/storage_conf.c
src/conf/storage_conf.c
+14
-9
tests/storagepoolxml2xmlout/pool-dir-naming.xml
tests/storagepoolxml2xmlout/pool-dir-naming.xml
+0
-2
tests/storagepoolxml2xmlout/pool-dir.xml
tests/storagepoolxml2xmlout/pool-dir.xml
+0
-2
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
+0
-2
tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml
tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml
+0
-2
tests/storagevolxml2xmlout/vol-gluster-dir.xml
tests/storagevolxml2xmlout/vol-gluster-dir.xml
+0
-2
tests/storagevolxml2xmlout/vol-sheepdog.xml
tests/storagevolxml2xmlout/vol-sheepdog.xml
+0
-2
未找到文件。
docs/schemas/storagecommon.rng
浏览文件 @
c4d27bdd
...
...
@@ -101,18 +101,22 @@
<element
name=
'mode'
>
<ref
name=
'octalMode'
/>
</element>
<optional>
<element
name=
'owner'
>
<choice>
<ref
name=
'unsignedInt'
/>
<value>
-1
</value>
</choice>
</element>
</optional>
<optional>
<element
name=
'group'
>
<choice>
<ref
name=
'unsignedInt'
/>
<value>
-1
</value>
</choice>
</element>
</optional>
<optional>
<element
name=
'label'
>
<text/>
...
...
src/conf/storage_conf.c
浏览文件 @
c4d27bdd
...
...
@@ -759,6 +759,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
if
(
virXPathNode
(
"./owner"
,
ctxt
)
==
NULL
)
{
perms
->
uid
=
(
uid_t
)
-
1
;
}
else
{
/* We previously could output -1, so continue to parse it */
if
(
virXPathLongLong
(
"number(./owner)"
,
ctxt
,
&
val
)
<
0
||
((
uid_t
)
val
!=
val
&&
val
!=
-
1
))
{
...
...
@@ -773,6 +774,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
if
(
virXPathNode
(
"./group"
,
ctxt
)
==
NULL
)
{
perms
->
gid
=
(
gid_t
)
-
1
;
}
else
{
/* We previously could output -1, so continue to parse it */
if
(
virXPathLongLong
(
"number(./group)"
,
ctxt
,
&
val
)
<
0
||
((
gid_t
)
val
!=
val
&&
val
!=
-
1
))
{
...
...
@@ -1187,8 +1189,10 @@ virStoragePoolDefFormatBuf(virBufferPtr buf,
virBufferAdjustIndent
(
buf
,
2
);
virBufferAsprintf
(
buf
,
"<mode>0%o</mode>
\n
"
,
def
->
target
.
perms
.
mode
);
if
(
def
->
target
.
perms
.
uid
!=
(
uid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<owner>%d</owner>
\n
"
,
(
int
)
def
->
target
.
perms
.
uid
);
if
(
def
->
target
.
perms
.
gid
!=
(
gid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<group>%d</group>
\n
"
,
(
int
)
def
->
target
.
perms
.
gid
);
virBufferEscapeString
(
buf
,
"<label>%s</label>
\n
"
,
...
...
@@ -1522,12 +1526,13 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options,
virBufferAsprintf
(
buf
,
"<mode>0%o</mode>
\n
"
,
def
->
perms
->
mode
);
if
(
def
->
perms
->
uid
!=
(
uid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<owner>%d</owner>
\n
"
,
(
int
)
def
->
perms
->
uid
);
if
(
def
->
perms
->
gid
!=
(
gid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<group>%d</group>
\n
"
,
(
int
)
def
->
perms
->
gid
);
virBufferEscapeString
(
buf
,
"<label>%s</label>
\n
"
,
def
->
perms
->
label
);
...
...
tests/storagepoolxml2xmlout/pool-dir-naming.xml
浏览文件 @
c4d27bdd
...
...
@@ -10,8 +10,6 @@
<path>
/var/lib/libvirt/
<
images
>
</path>
<permissions>
<mode>
0700
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
<label>
some_label_t
</label>
</permissions>
</target>
...
...
tests/storagepoolxml2xmlout/pool-dir.xml
浏览文件 @
c4d27bdd
...
...
@@ -10,8 +10,6 @@
<path>
/var/lib/libvirt/images
</path>
<permissions>
<mode>
0700
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
<label>
some_label_t
</label>
</permissions>
</target>
...
...
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
浏览文件 @
c4d27bdd
...
...
@@ -13,8 +13,6 @@
<path>
/mnt/gluster
</path>
<permissions>
<mode>
0755
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
</permissions>
</target>
</pool>
tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml
浏览文件 @
c4d27bdd
...
...
@@ -10,8 +10,6 @@
<format
type=
'dir'
/>
<permissions>
<mode>
0600
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
</permissions>
</target>
</volume>
tests/storagevolxml2xmlout/vol-gluster-dir.xml
浏览文件 @
c4d27bdd
...
...
@@ -10,8 +10,6 @@
<format
type=
'dir'
/>
<permissions>
<mode>
0600
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
</permissions>
</target>
</volume>
tests/storagevolxml2xmlout/vol-sheepdog.xml
浏览文件 @
c4d27bdd
...
...
@@ -9,8 +9,6 @@
<format
type=
'unknown'
/>
<permissions>
<mode>
0600
</mode>
<owner>
-1
</owner>
<group>
-1
</group>
</permissions>
</target>
</volume>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录