Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
katautils: Revert "katautils: don't mask systemd units"
Browse files Browse the repository at this point in the history
This reverts commit d66d855.

Fixes: #2000.

Signed-off-by: Salvador Fuentes <[email protected]>
  • Loading branch information
chavafg committed May 24, 2019
1 parent 360ffdc commit b044ddf
Showing 1 changed file with 83 additions and 0 deletions.
83 changes: 83 additions & 0 deletions pkg/katautils/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,94 @@ var systemdKernelParam = []vc.Param{
},
}

// kernel params to improve memory footprint
var noTraceKernelParam = []vc.Param{
// No logs: agent has its own logging system
{
Key: "systemd.mask",
Value: "systemd-journald.service",
},
{
Key: "systemd.mask",
Value: "systemd-journald.socket",
},
{
Key: "systemd.mask",
Value: "systemd-journal-flush.service",
},
{
Key: "systemd.mask",
Value: "systemd-journald-dev-log.socket",
},
// No udev events: agent implements udev events
{
Key: "systemd.mask",
Value: "systemd-udevd.service",
},
{
Key: "systemd.mask",
Value: "systemd-udevd.socket",
},
{
Key: "systemd.mask",
Value: "systemd-udev-trigger.service",
},
{
Key: "systemd.mask",
Value: "systemd-udevd-kernel.socket",
},
{
Key: "systemd.mask",
Value: "systemd-udevd-control.socket",
},
// No timesync: kata is able to setup the time and this service consume network
{
Key: "systemd.mask",
Value: "systemd-timesyncd.service",
},
// No update audit logs
{
Key: "systemd.mask",
Value: "systemd-update-utmp.service",
},
// No temporal files
{
Key: "systemd.mask",
Value: "systemd-tmpfiles-setup.service",
},
{
Key: "systemd.mask",
Value: "systemd-tmpfiles-cleanup.service",
},
{
Key: "systemd.mask",
Value: "systemd-tmpfiles-cleanup.timer",
},
// No mounts
{
Key: "systemd.mask",
Value: "tmp.mount",
},
// No random seed
{
Key: "systemd.mask",
Value: "systemd-random-seed.service",
},
// No coredump
{
Key: "systemd.mask",
Value: "[email protected]",
},
}

func getKernelParams(needSystemd, trace bool) []vc.Param {
p := []vc.Param{}

if needSystemd {
p = append(p, systemdKernelParam...)
if !trace {
p = append(p, noTraceKernelParam...)
}
}

return p
Expand Down

0 comments on commit b044ddf

Please sign in to comment.