kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-19 17:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chroot not opening and closing properly (#261)

Browse Source
This commit is contained in:
Itxaka
2024-03-19 14:14:32 +01:00
committed by GitHub
parent 8583d38b68
commit 4a5a3e9bd0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/utils/chroot.go
View File

@@ -49,6 +49,7 @@ func NewChroot(path string, config *agentConfig.Config) *Chroot {
// ChrootedCallback runs the given callback in a chroot environment // ChrootedCallback runs the given callback in a chroot environment
func ChrootedCallback(cfg *agentConfig.Config, path string, bindMounts map[string]string, callback func() error) error { func ChrootedCallback(cfg *agentConfig.Config, path string, bindMounts map[string]string, callback func() error) error {
cfg.Logger.Debugf("Extra mounts: %v", bindMounts)
chroot := NewChroot(path, cfg) chroot := NewChroot(path, cfg)
chroot.SetExtraMounts(bindMounts) chroot.SetExtraMounts(bindMounts)
return chroot.RunCallback(callback) return chroot.RunCallback(callback)
@@ -78,6 +79,7 @@ func (c *Chroot) Prepare() error {
}() }()
for _, mnt := range c.defaultMounts { for _, mnt := range c.defaultMounts {
c.config.Logger.Debugf("Mounting %s to chroot", mnt)
mountPoint := fmt.Sprintf("%s%s", strings.TrimSuffix(c.path, "/"), mnt) mountPoint := fmt.Sprintf("%s%s", strings.TrimSuffix(c.path, "/"), mnt)
err = fsutils.MkdirAll(c.config.Fs, mountPoint, constants.DirPerm) err = fsutils.MkdirAll(c.config.Fs, mountPoint, constants.DirPerm)
if err != nil { if err != nil {
@@ -88,6 +90,7 @@ func (c *Chroot) Prepare() error {
return err return err
} }
c.activeMounts = append(c.activeMounts, mountPoint) c.activeMounts = append(c.activeMounts, mountPoint)
c.config.Logger.Debugf("Mounted %s to %s", mnt, mountPoint)
} }
for k := range c.extraMounts { for k := range c.extraMounts {
@@ -95,6 +98,7 @@ func (c *Chroot) Prepare() error {
} }
sort.Strings(keys) sort.Strings(keys)
for _, k := range keys { for _, k := range keys {
c.config.Logger.Debugf("Mounting %s to chroot", k)
mountPoint := fmt.Sprintf("%s%s", strings.TrimSuffix(c.path, "/"), c.extraMounts[k]) mountPoint := fmt.Sprintf("%s%s", strings.TrimSuffix(c.path, "/"), c.extraMounts[k])
err = fsutils.MkdirAll(c.config.Fs, mountPoint, constants.DirPerm) err = fsutils.MkdirAll(c.config.Fs, mountPoint, constants.DirPerm)
if err != nil { if err != nil {
@@ -105,6 +109,7 @@ func (c *Chroot) Prepare() error {
return err return err
} }
c.activeMounts = append(c.activeMounts, mountPoint) c.activeMounts = append(c.activeMounts, mountPoint)
c.config.Logger.Debugf("Mounted %s to %s", k, mountPoint)
} }
return nil return nil
@@ -122,6 +127,7 @@ func (c *Chroot) Close() error {
c.config.Logger.Errorf("Error unmounting %s: %s", curr, err) c.config.Logger.Errorf("Error unmounting %s: %s", curr, err)
failures = append(failures, curr) failures = append(failures, curr)
} }
} }
if len(failures) > 0 { if len(failures) > 0 {
c.activeMounts = failures c.activeMounts = failures
@@ -133,6 +139,7 @@ func (c *Chroot) Close() error {
// RunCallback runs the given callback in a chroot environment // RunCallback runs the given callback in a chroot environment
func (c *Chroot) RunCallback(callback func() error) (err error) { func (c *Chroot) RunCallback(callback func() error) (err error) {
var currentPath string var currentPath string
var oldRootF *os.File
// Store current path // Store current path
currentPath, err = os.Getwd() currentPath, err = os.Getwd()
@@ -148,11 +155,12 @@ func (c *Chroot) RunCallback(callback func() error) (err error) {
}() }()
// Store current root // Store current root
rootPath, _ := c.config.Fs.RawPath("/") oldRootF, err = c.config.Fs.OpenFile("/", os.O_RDONLY, 0)
if err != nil { if err != nil {
c.config.Logger.Errorf("Can't open current root") c.config.Logger.Errorf("Can't open current root")
return err return err
} }
defer oldRootF.Close()
if len(c.activeMounts) == 0 { if len(c.activeMounts) == 0 {
err = c.Prepare() err = c.Prepare()
@@ -182,7 +190,7 @@ func (c *Chroot) RunCallback(callback func() error) (err error) {
// Restore to old root // Restore to old root
defer func() { defer func() {
tmpErr := os.Chdir(rootPath) tmpErr := oldRootF.Chdir()
if tmpErr != nil { if tmpErr != nil {
c.config.Logger.Errorf("Can't change to old root dir") c.config.Logger.Errorf("Can't change to old root dir")
if err == nil { if err == nil {