mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-20 08:18:24 +00:00
Merge pull request #8836 from microsoft/danmihai1/test-with-cbl-mariner
genpolicy: use root path from cbl-mariner Guest VM
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"pause_container": {
|
"pause_container": {
|
||||||
"Root": {
|
"Root": {
|
||||||
"Path": "$(cpath)/$(bundle-id)",
|
"Path": "$(cpath)/$(bundle-id)/rootfs",
|
||||||
"Readonly": true
|
"Readonly": true
|
||||||
},
|
},
|
||||||
"Mounts": [
|
"Mounts": [
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
},
|
},
|
||||||
"other_container": {
|
"other_container": {
|
||||||
"Root": {
|
"Root": {
|
||||||
"Path": "$(cpath)/$(bundle-id)"
|
"Path": "$(cpath)/$(bundle-id)/rootfs"
|
||||||
},
|
},
|
||||||
"Mounts": [
|
"Mounts": [
|
||||||
{
|
{
|
||||||
|
@@ -701,8 +701,9 @@ is_ip_other_byte(component) {
|
|||||||
|
|
||||||
# OCI root.Path
|
# OCI root.Path
|
||||||
allow_root_path(p_oci, i_oci, bundle_id) {
|
allow_root_path(p_oci, i_oci, bundle_id) {
|
||||||
|
i_path := i_oci.Root.Path
|
||||||
p_path1 := p_oci.Root.Path
|
p_path1 := p_oci.Root.Path
|
||||||
print("allow_root_path: p_path1 =", p_path1)
|
print("allow_root_path: i_path =", i_path, "p_path1 =", p_path1)
|
||||||
|
|
||||||
p_path2 := replace(p_path1, "$(cpath)", policy_data.common.cpath)
|
p_path2 := replace(p_path1, "$(cpath)", policy_data.common.cpath)
|
||||||
print("allow_root_path: p_path2 =", p_path2)
|
print("allow_root_path: p_path2 =", p_path2)
|
||||||
@@ -710,7 +711,7 @@ allow_root_path(p_oci, i_oci, bundle_id) {
|
|||||||
p_path3 := replace(p_path2, "$(bundle-id)", bundle_id)
|
p_path3 := replace(p_path2, "$(bundle-id)", bundle_id)
|
||||||
print("allow_root_path: p_path3 =", p_path3)
|
print("allow_root_path: p_path3 =", p_path3)
|
||||||
|
|
||||||
p_path3 == i_oci.Root.Path
|
p_path3 == i_path
|
||||||
|
|
||||||
print("allow_root_path: true")
|
print("allow_root_path: true")
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user