diff --git a/pkg/prebuild/prepare/configure.go b/pkg/prebuild/prepare/configure.go index 79875091c..a6e954485 100644 --- a/pkg/prebuild/prepare/configure.go +++ b/pkg/prebuild/prepare/configure.go @@ -7,7 +7,6 @@ package prepare import ( "fmt" - "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild" ) @@ -36,7 +35,7 @@ func (p Configure) Apply() ([]string, error) { } if prebuild.Version < 3.0 { - if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil { + if err := prebuild.DistDir.Join("ubuntu").CopyFS(prebuild.RootApparmord); err != nil { return res, err } } @@ -48,7 +47,7 @@ func (p Configure) Apply() ([]string, error) { if prebuild.Version < 4.1 { // Copy Debian specific abstractions - if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil { + if err := prebuild.DistDir.Join("ubuntu").CopyFS(prebuild.RootApparmord); err != nil { return res, err } } diff --git a/pkg/prebuild/prepare/fsp.go b/pkg/prebuild/prepare/fsp.go index bfb333e56..b639a4dc8 100644 --- a/pkg/prebuild/prepare/fsp.go +++ b/pkg/prebuild/prepare/fsp.go @@ -29,7 +29,7 @@ func (p FullSystemPolicy) Apply() ([]string, error) { res := []string{} // Install full system policy profiles - if err := paths.CopyTo(paths.New("apparmor.d/groups/_full/"), prebuild.Root.Join("apparmor.d")); err != nil { + if err := paths.New("apparmor.d/groups/_full/").CopyFS(prebuild.Root.Join("apparmor.d")); err != nil { return res, err } @@ -58,5 +58,5 @@ func (p FullSystemPolicy) Apply() ([]string, error) { } // Set systemd unit drop-in files - return res, paths.CopyTo(prebuild.SystemdDir.Join("full"), prebuild.Root.Join("systemd")) + return res, prebuild.SystemdDir.Join("full").CopyFS(prebuild.Root.Join("systemd")) } diff --git a/pkg/prebuild/prepare/synchronise.go b/pkg/prebuild/prepare/synchronise.go index fe24471d8..b6c2dbf5b 100644 --- a/pkg/prebuild/prepare/synchronise.go +++ b/pkg/prebuild/prepare/synchronise.go @@ -41,7 +41,7 @@ func (p Synchronise) Apply() ([]string, error) { } if src.IsDir() { - if err := paths.CopyTo(src, dst); err != nil { + if err := src.CopyFS(dst); err != nil { return res, err } } else { diff --git a/pkg/prebuild/prepare/systemd.go b/pkg/prebuild/prepare/systemd.go index b7646e4bf..611a9ad69 100644 --- a/pkg/prebuild/prepare/systemd.go +++ b/pkg/prebuild/prepare/systemd.go @@ -5,7 +5,6 @@ package prepare import ( - "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild" ) @@ -33,9 +32,9 @@ func init() { } func (p SystemdDefault) Apply() ([]string, error) { - return []string{}, paths.CopyTo(prebuild.SystemdDir.Join("default"), prebuild.Root.Join("systemd")) + return []string{}, prebuild.SystemdDir.Join("default").CopyFS(prebuild.Root.Join("systemd")) } func (p SystemdEarly) Apply() ([]string, error) { - return []string{}, paths.CopyTo(prebuild.SystemdDir.Join("early"), prebuild.Root.Join("systemd")) + return []string{}, prebuild.SystemdDir.Join("early").CopyFS(prebuild.Root.Join("systemd")) }