This repository has been archived by the owner on May 12, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
katautils: Revert "katautils: don't mask systemd units"
This reverts commit d66d855. Fixes: #2000. Signed-off-by: Salvador Fuentes <[email protected]>
- Loading branch information
Showing
1 changed file
with
83 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|