Merge pull request #213 from Incubaid/development_linuxname

Rename "linux"
This commit is contained in:
2025-11-26 13:51:24 -08:00
committed by GitHub
2 changed files with 19 additions and 19 deletions

View File

@@ -149,19 +149,19 @@ pub fn (mut config CrunConfig) set_hostname(hostname string) &CrunConfig {
} }
pub fn (mut config CrunConfig) set_memory_limit(limit_bytes u64) &CrunConfig { pub fn (mut config CrunConfig) set_memory_limit(limit_bytes u64) &CrunConfig {
config.spec.linux.resources.memory.limit = limit_bytes config.spec.linux_config.resources.memory.limit = limit_bytes
return config return config
} }
pub fn (mut config CrunConfig) set_cpu_limits(period u64, quota i64, shares u64) &CrunConfig { pub fn (mut config CrunConfig) set_cpu_limits(period u64, quota i64, shares u64) &CrunConfig {
config.spec.linux.resources.cpu.period = period config.spec.linux_config.resources.cpu.period = period
config.spec.linux.resources.cpu.quota = quota config.spec.linux_config.resources.cpu.quota = quota
config.spec.linux.resources.cpu.shares = shares config.spec.linux_config.resources.cpu.shares = shares
return config return config
} }
pub fn (mut config CrunConfig) set_pids_limit(limit i64) &CrunConfig { pub fn (mut config CrunConfig) set_pids_limit(limit i64) &CrunConfig {
config.spec.linux.resources.pids.limit = limit config.spec.linux_config.resources.pids.limit = limit
return config return config
} }
@@ -222,15 +222,15 @@ pub fn (mut config CrunConfig) set_terminal(value bool) &CrunConfig {
} }
pub fn (mut config CrunConfig) add_masked_path(path string) &CrunConfig { pub fn (mut config CrunConfig) add_masked_path(path string) &CrunConfig {
if path !in config.spec.linux.masked_paths { if path !in config.spec.linux_config.masked_paths {
config.spec.linux.masked_paths << path config.spec.linux_config.masked_paths << path
} }
return config return config
} }
pub fn (mut config CrunConfig) add_readonly_path(path string) &CrunConfig { pub fn (mut config CrunConfig) add_readonly_path(path string) &CrunConfig {
if path !in config.spec.linux.readonly_paths { if path !in config.spec.linux_config.readonly_paths {
config.spec.linux.readonly_paths << path config.spec.linux_config.readonly_paths << path
} }
return config return config
} }
@@ -293,7 +293,7 @@ fn create_default_spec() Spec {
} }
hostname: 'container' hostname: 'container'
mounts: create_default_mounts() mounts: create_default_mounts()
linux: Linux{ linux_config: LinuxConfig{
namespaces: create_default_namespaces() namespaces: create_default_namespaces()
masked_paths: [ masked_paths: [
'/proc/acpi', '/proc/acpi',

View File

@@ -3,14 +3,14 @@ module crun
// OCI Runtime Spec structures that can be directly encoded to JSON // OCI Runtime Spec structures that can be directly encoded to JSON
pub struct Spec { pub struct Spec {
pub mut: pub mut:
oci_version string @[json: 'ociVersion'] oci_version string @[json: 'ociVersion']
platform Platform platform Platform
process Process process Process
root Root root Root
hostname string hostname string
mounts []Mount mounts []Mount
linux Linux linux_config LinuxConfig
hooks Hooks hooks Hooks
} }
pub struct Platform { pub struct Platform {
@@ -68,7 +68,7 @@ pub mut:
options []string options []string
} }
pub struct Linux { pub struct LinuxConfig {
pub mut: pub mut:
namespaces []LinuxNamespace namespaces []LinuxNamespace
resources LinuxResources resources LinuxResources