Skip to content

Adding debug messages for snapper configuration #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidcassany merged 3 commits into from
Mar 6, 2024
Merged

Adding debug messages for snapper configuration #1991

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecd0781
Adding debug messages for snapper configuration
davidcassany Mar 6, 2024
e5d6fa0
Use working directory to set the snapper configuration
davidcassany Mar 6, 2024
d5a3fac
Fix unit tests
davidcassany Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkg/snapshotter/btrfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,14 +616,14 @@ func (b *Btrfs) setBootloader() error {
}

func (b *Btrfs) configureSnapper(snapshot *v1.Snapshot) error {
defaultTmpl, err := utils.FindFile(b.cfg.Fs, snapshot.Path, configTemplatesPaths()...)
defaultTmpl, err := utils.FindFile(b.cfg.Fs, snapshot.WorkDir, configTemplatesPaths()...)
if err != nil {
b.cfg.Logger.Errorf("failed to find default snapper configuration template")
return err
}

sysconfigData := map[string]string{}
sysconfig := filepath.Join(snapshot.Path, snapperSysconfig)
sysconfig := filepath.Join(snapshot.WorkDir, snapperSysconfig)
if ok, _ := utils.Exists(b.cfg.Fs, sysconfig); ok {
sysconfigData, err = utils.LoadEnvFile(b.cfg.Fs, sysconfig)
if err != nil {
Expand All @@ -633,6 +633,7 @@ func (b *Btrfs) configureSnapper(snapshot *v1.Snapshot) error {
}
sysconfigData["SNAPPER_CONFIGS"] = "root"

b.cfg.Logger.Debugf("Creating sysconfig snapper configuration at '%s'", sysconfig)
err = utils.WriteEnvFile(b.cfg.Fs, sysconfigData, sysconfig)
if err != nil {
b.cfg.Logger.Errorf("failed writing snapper global configuration file: %v", err)
Expand All @@ -650,7 +651,9 @@ func (b *Btrfs) configureSnapper(snapshot *v1.Snapshot) error {
snapCfg["NUMBER_LIMIT"] = strconv.Itoa(b.snapshotterCfg.MaxSnaps)
snapCfg["NUMBER_LIMIT_IMPORTANT"] = strconv.Itoa(b.snapshotterCfg.MaxSnaps)

err = utils.WriteEnvFile(b.cfg.Fs, snapCfg, filepath.Join(snapshot.Path, snapperRootConfig))
rootCfg := filepath.Join(snapshot.WorkDir, snapperRootConfig)
b.cfg.Logger.Debugf("Creating 'root' snapper configuration at '%s'", rootCfg)
err = utils.WriteEnvFile(b.cfg.Fs, snapCfg, rootCfg)
if err != nil {
b.cfg.Logger.Errorf("failed writing snapper root configuration file: %v", err)
return err
Expand Down