rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-08-10 18:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mount): call sync before/after operations (#288)

Browse Source 
* fix(mount): call sync after mount ops

Signed-off-by: mudler <mudler@kairos.io>

* refactor(mount): replace calls wrapped with sync

Signed-off-by: mudler <mudler@kairos.io>

* be consistent

Signed-off-by: mudler <mudler@kairos.io>

* lint fixes

Signed-off-by: mudler <mudler@kairos.io>

---------

Signed-off-by: mudler <mudler@kairos.io>
This commit is contained in:
Ettore Di Giacinto 2024-04-19 12:01:16 +02:00 committed by GitHub
parent 4916e6dba7
commit d14a047aa6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/utils/chroot.go
View File

@ -70,9 +70,9 @@ func (c *Chroot) Prepare() error {
// For example you can also have a cdrom device mounted under /dev/sr0 or /dev/cdrom and we dont know how to find it and mark it private // For example you can also have a cdrom device mounted under /dev/sr0 or /dev/cdrom and we dont know how to find it and mark it private
switch { switch {
case mnt == "/sys", mnt == "/dev", mnt == "/run": case mnt == "/sys", mnt == "/dev", mnt == "/run":
err = syscall.Mount(mnt, mountPoint, "", syscall.MS_BIND, "") err = Mount(mnt, mountPoint, "", syscall.MS_BIND, "")
default: default:
err = syscall.Mount(mnt, mountPoint, "", syscall.MS_BIND|syscall.MS_REC, "") err = Mount(mnt, mountPoint, "", syscall.MS_BIND|syscall.MS_REC, "")
} }
if err != nil { if err != nil {
@ -80,7 +80,7 @@ func (c *Chroot) Prepare() error {
return err return err
} }
// "remount" with private so unmount events do not propagate // "remount" with private so unmount events do not propagate
err = syscall.Mount("", mountPoint, "", syscall.MS_PRIVATE, "") err = Mount("", mountPoint, "", syscall.MS_PRIVATE, "")
if err != nil { if err != nil {
Log.Err(err).Str("where", mountPoint).Str("what", mnt).Msg("Mounting chroot bind") Log.Err(err).Str("where", mountPoint).Str("what", mnt).Msg("Mounting chroot bind")
return err return err

22
internal/utils/mounts.go
View File

@ -201,13 +201,13 @@ func Fsck(device string) error {
func MountBasic() { func MountBasic() {
_ = os.MkdirAll("/proc", 0755) _ = os.MkdirAll("/proc", 0755)
if !IsMounted("/proc") { if !IsMounted("/proc") {
_ = syscall.Mount("proc", "/proc", "proc", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "") _ = Mount("proc", "/proc", "proc", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "")
_ = syscall.Mount("", "/proc", "", syscall.MS_SHARED, "") _ = Mount("", "/proc", "", syscall.MS_SHARED, "")
} }
_ = os.MkdirAll("/run", 0755) _ = os.MkdirAll("/run", 0755)
if !IsMounted("/run") { if !IsMounted("/run") {
_ = syscall.Mount("tmpfs", "/run", "tmpfs", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "mode=755") _ = Mount("tmpfs", "/run", "tmpfs", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "mode=755")
_ = syscall.Mount("", "/run", "", syscall.MS_SHARED, "") _ = Mount("", "/run", "", syscall.MS_SHARED, "")
} }
} }
@ -302,3 +302,17 @@ func ActivateLVM() error {
_, _ = CommandWithPath("udevadm --trigger") _, _ = CommandWithPath("udevadm --trigger")
return err return err
} }
// Force flushing the data to disk.
func Sync() {
// wrapper isn't necessary, but leaving it here in case
// we want to add more logic in the future.
syscall.Sync()
}
// Mount will mount the given source to the target with the given fstype and flags.
func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
Sync()
defer Sync()
return syscall.Mount(source, target, fstype, flags, data)
}

3
pkg/op/operation.go
View File

@ -17,6 +17,9 @@ type MountOperation struct {
} }
func (m MountOperation) Run() error { func (m MountOperation) Run() error {
// call sync to make sure the data is written to disk
defer internalUtils.Sync()
// Add context to sublogger // Add context to sublogger
l := internalUtils.Log.With().Str("what", m.MountOption.Source).Str("where", m.Target).Str("type", m.MountOption.Type).Strs("options", m.MountOption.Options).Logger() l := internalUtils.Log.With().Str("what", m.MountOption.Source).Str("where", m.Target).Str("type", m.MountOption.Type).Strs("options", m.MountOption.Options).Logger()
// Not sure why this defaults to debuglevel when creating a sublogger, so make sure we set it properly // Not sure why this defaults to debuglevel when creating a sublogger, so make sure we set it properly

18
pkg/state/steps_uki.go
View File

@ -155,7 +155,7 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
internalUtils.Log.Err(e).Msg("Creating dir") internalUtils.Log.Err(e).Msg("Creating dir")
} }
e = syscall.Mount(m.what, m.where, m.fs, m.flags, m.data) e = internalUtils.Mount(m.what, m.where, m.fs, m.flags, m.data)
if e != nil { if e != nil {
err = multierror.Append(err, e) err = multierror.Append(err, e)
internalUtils.Log.Err(e).Str("what", m.what).Str("where", m.where).Str("type", m.fs).Msg("Mounting") internalUtils.Log.Err(e).Str("what", m.what).Str("where", m.where).Str("type", m.fs).Msg("Mounting")
@ -191,7 +191,7 @@ func (s *State) UkiPivotToSysroot(g *herd.Graph) error {
// Mount a tmpfs under sysroot // Mount a tmpfs under sysroot
internalUtils.Log.Debug().Msg("Mounting tmpfs on sysroot") internalUtils.Log.Debug().Msg("Mounting tmpfs on sysroot")
err = syscall.Mount("tmpfs", s.path(cnst.UkiSysrootDir), "tmpfs", 0, "") err = internalUtils.Mount("tmpfs", s.path(cnst.UkiSysrootDir), "tmpfs", 0, "")
if err != nil { if err != nil {
internalUtils.Log.Err(err).Msg("mounting tmpfs on sysroot") internalUtils.Log.Err(err).Msg("mounting tmpfs on sysroot")
internalUtils.DropToEmergencyShell() internalUtils.DropToEmergencyShell()
@ -277,7 +277,7 @@ func (s *State) UkiPivotToSysroot(g *herd.Graph) error {
} }
} }
err = syscall.Mount(d, newDir, "", syscall.MS_MOVE, "") err = internalUtils.Mount(d, newDir, "", syscall.MS_MOVE, "")
if err != nil { if err != nil {
internalUtils.Log.Err(err).Str("what", d).Str("where", newDir).Msg("move mount") internalUtils.Log.Err(err).Str("what", d).Str("where", newDir).Msg("move mount")
continue continue
@ -292,7 +292,7 @@ func (s *State) UkiPivotToSysroot(g *herd.Graph) error {
} }
internalUtils.Log.Debug().Str("what", s.path(cnst.UkiSysrootDir)).Str("where", "/").Msg("Moving mount") internalUtils.Log.Debug().Str("what", s.path(cnst.UkiSysrootDir)).Str("where", "/").Msg("Moving mount")
if err = syscall.Mount(s.path(cnst.UkiSysrootDir), "/", "", syscall.MS_MOVE, ""); err != nil { if err = internalUtils.Mount(s.path(cnst.UkiSysrootDir), "/", "", syscall.MS_MOVE, ""); err != nil {
internalUtils.Log.Err(err).Msg("mount move") internalUtils.Log.Err(err).Msg("mount move")
internalUtils.DropToEmergencyShell() internalUtils.DropToEmergencyShell()
} }
@ -452,13 +452,12 @@ func (s *State) UKIMountLiveCd(g *herd.Graph, opts ...herd.OpOption) error {
// Mount it // Mount it
if cdrom != "" { if cdrom != "" {
err = syscall.Mount(cdrom, s.path(cnst.UkiLivecdMountPoint), cnst.UkiDefaultcdromFsType, syscall.MS_RDONLY, "") err = internalUtils.Mount(cdrom, s.path(cnst.UkiLivecdMountPoint), cnst.UkiDefaultcdromFsType, syscall.MS_RDONLY, "")
if err != nil { if err != nil {
internalUtils.Log.Err(err).Msg(fmt.Sprintf("Mounting %s", cdrom)) internalUtils.Log.Err(err).Msg(fmt.Sprintf("Mounting %s", cdrom))
return err return err
} }
internalUtils.Log.Debug().Msg(fmt.Sprintf("Mounted %s", cdrom)) internalUtils.Log.Debug().Msg(fmt.Sprintf("Mounted %s", cdrom))
syscall.Sync()
// This needs the loop module to be inserted in the kernel! // This needs the loop module to be inserted in the kernel!
cmd := fmt.Sprintf("losetup --show -f %s", s.path(filepath.Join(cnst.UkiLivecdMountPoint, cnst.UkiIsoBootImage))) cmd := fmt.Sprintf("losetup --show -f %s", s.path(filepath.Join(cnst.UkiLivecdMountPoint, cnst.UkiIsoBootImage)))
@ -469,13 +468,12 @@ func (s *State) UKIMountLiveCd(g *herd.Graph, opts ...herd.OpOption) error {
internalUtils.Log.Err(err).Str("out", out).Msg(cmd) internalUtils.Log.Err(err).Str("out", out).Msg(cmd)
return err return err
} }
syscall.Sync()
err = syscall.Mount(loop, s.path(cnst.UkiIsoBaseTree), cnst.UkiDefaultEfiimgFsType, syscall.MS_RDONLY, "") err = internalUtils.Mount(loop, s.path(cnst.UkiIsoBaseTree), cnst.UkiDefaultEfiimgFsType, syscall.MS_RDONLY, "")
if err != nil { if err != nil {
internalUtils.Log.Err(err).Msg(fmt.Sprintf("Mounting %s into %s", loop, s.path(cnst.UkiIsoBaseTree))) internalUtils.Log.Err(err).Msg(fmt.Sprintf("Mounting %s into %s", loop, s.path(cnst.UkiIsoBaseTree)))
return err return err
} }
syscall.Sync()
return nil return nil
} }
internalUtils.Log.Debug().Msg("No livecd/install media found") internalUtils.Log.Debug().Msg("No livecd/install media found")
@ -502,7 +500,7 @@ func (s *State) UKIBootInitDagStep(g *herd.Graph) error {
} }
internalUtils.Log.Debug().Str("what", s.path(s.Rootdir)).Msg("Mount / RO") internalUtils.Log.Debug().Str("what", s.path(s.Rootdir)).Msg("Mount / RO")
if err = syscall.Mount("", s.path(s.Rootdir), "", syscall.MS_REMOUNT|syscall.MS_RDONLY, "ro"); err != nil { if err = internalUtils.Mount("", s.path(s.Rootdir), "", syscall.MS_REMOUNT|syscall.MS_RDONLY, "ro"); err != nil {
internalUtils.Log.Err(err).Msg("Mount / RO") internalUtils.Log.Err(err).Msg("Mount / RO")
internalUtils.DropToEmergencyShell() internalUtils.DropToEmergencyShell()
} }