Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
elainezhao96 committed Nov 13, 2024
1 parent 4be5716 commit b020804
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions toolkit/tools/internal/safechroot/safechroot.go
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ func extractWorkerTar(chroot string, workerTar string) (err error) {

// GetMountPoints gets a copy of the list of mounts the Chroot was initialized with.
func (c *Chroot) GetMountPoints() []*MountPoint {
// Create a copy of the list so that the caller can't mess with the list.
mountPoints := append([]*MountPoint(nil), c.mountPoints...)
return mountPoints
// Create a copy of the list so that the caller can't mess with the list.
mountPoints := append([]*MountPoint(nil), c.mountPoints...)
return mountPoints
}

// stopGPGComponents stops gpg-agent and keyboxd if they are running inside the chroot.
Expand Down
5 changes: 5 additions & 0 deletions toolkit/tools/osmodifierapi/os.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,10 @@ func (s *OS) IsValid() error {
}
}

err = s.Verity.IsValid()
if err != nil {
return fmt.Errorf("invalid verity:\n%w", err)
}

return nil
}
2 changes: 1 addition & 1 deletion toolkit/tools/pkg/imagecustomizerlib/customizeselinux.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ func selinuxSetFiles(selinuxMode imagecustomizerapi.SELinuxMode, imageChroot *sa
}

return nil
}
}

0 comments on commit b020804

Please sign in to comment.