rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-24 20:09:21 +00:00
Code Issues Releases Wiki Activity

v2.0.0-rc1

Browse Source 
* Load apparmor on boot also when booting from disk
* Rename system-dockerd to system-engine
* Do not cache service metadatas
* Do not cache Docker image to ISO file
* Disable system-docker bridge by default
* Remove deprecated --oom-score-adjust flag
* Update VMware tools to 12.2.5
* Update QEMU guest agent to 7.2
* Remove broken VirtualBox tools
This commit is contained in:
Olli Janatuinen
2023-08-14 17:52:41 +00:00
parent f87c220f1b
commit 615b3d4f7c
13 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/install.go
View File

@@ -426,7 +426,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
//cloudConfig := SCRIPTS_DIR + "/conf/empty.yml" //${cloudConfig:-"${SCRIPTS_DIR}/conf/empty.yml"}
CONSOLE := "tty0"
baseName := "/mnt/new_img"
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=never scsi_mod.use_blk_mq=1 panic=10" // console="+CONSOLE
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=never scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor panic=10" // console="+CONSOLE
if statedir != "" {
kernelArgs = kernelArgs + " rancher.state.directory=" + statedir
}

4
cmd/control/user_docker.go
View File

@@ -186,14 +186,14 @@ func startDocker(cfg *config.CloudConfig) error {
return err
}
cmd := []string{"system-docker-runc", "exec", "--", info.ID, "env"}
cmd := []string{"system-engine-rc", "exec", "--", info.ID, "env"}
log.Info(dockerCfg.AppendEnv())
cmd = append(cmd, dockerCfg.AppendEnv()...)
cmd = append(cmd, dockerCommand...)
cmd = append(cmd, args...)
log.Infof("Running %v", cmd)
return syscall.Exec("/usr/bin/system-docker-runc", cmd, os.Environ())
return syscall.Exec("/usr/bin/system-engine-rc", cmd, os.Environ())
}
func waitForPid(service string, project *project.Project) (int, error) {