kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-07-13 16:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix journald mount on non systemd systems (#800)

Browse Source
This commit is contained in:
Itxaka 2025-06-04 11:19:27 +02:00 committed by GitHub
parent 694a280959
commit 67e7590170
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/utils/chroot.go
View File

@ -38,13 +38,20 @@ type Chroot struct {
} }
func NewChroot(path string, config *agentConfig.Config) *Chroot { func NewChroot(path string, config *agentConfig.Config) *Chroot {
return &Chroot{ chroot := &Chroot{
path: path, path: path,
defaultMounts: []string{"/dev", "/dev/pts", "/proc", "/sys", "/run/systemd/journal/"}, // Add journal so we keep logs defaultMounts: []string{"/dev", "/dev/pts", "/proc", "/sys"},
extraMounts: map[string]string{}, extraMounts: map[string]string{},
activeMounts: []string{}, activeMounts: []string{},
config: config, config: config,
} }
// If we have systemd running, we need to mount the journal directory to keep logger open
if fi, err := os.Lstat("/run/systemd/system"); err == nil && fi.IsDir() {
chroot.defaultMounts = append(chroot.defaultMounts, "/run/systemd/journal/")
}
return chroot
} }
// ChrootedCallback runs the given callback in a chroot environment // ChrootedCallback runs the given callback in a chroot environment