Skip to content

stages/files: fix relabel path to be relative to sysroot #771

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
jlebon merged 1 commit into from
Mar 25, 2019
Merged

stages/files: fix relabel path to be relative to sysroot #771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions internal/exec/stages/files/filesystemEntries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"os"
"path/filepath"
"sort"
"strings"

configUtil "github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental/types"
Expand Down Expand Up @@ -248,6 +249,9 @@ func (s *stage) createEntries(files []filesystemEntry) error {

for _, e := range files {
path := e.getPath()
if !strings.HasPrefix(path, s.DestDir) {
panic(fmt.Sprintf("Entry path %s isn't under prefix %s", path, s.DestDir))
}
if s.relabeling() {
// relabel from the first parent dir that we'll have to create --
// alternatively, we could make `MkdirForFile` fancier instead of
Expand All @@ -264,14 +268,15 @@ func (s *stage) createEntries(files []filesystemEntry) error {
}

// we're done on the first hit -- also sanity check we didn't
// somehow get all the way up to /
if exists || dir == "/" {
// somehow get all the way up to /sysroot
if exists || dir == s.DestDir {
break
}
relabelFrom = dir
dir = filepath.Dir(dir)
}
s.relabel(relabelFrom)
// trim off prefix since this needs to be relative to the sysroot
s.relabel(relabelFrom[len(s.DestDir):])
}
if err := e.create(s.Logger, s.Util); err != nil {
return err
Expand Down