felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: do not use rsync to synchronise file anymore.

Browse source
This commit is contained in:
Alexandre Pujol 2023-11-19 14:47:55 +00:00
parent 5eb120cdbb
commit 9e04743156
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
5 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/prebuild/prepare.go
View file

@ -7,7 +7,6 @@ package prebuild
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
@ -28,15 +27,14 @@ type PrepareFunc func() error
// Initialize a new clean apparmor.d build directory
func Synchronise() error {
dirs := paths.PathList{RootApparmord, Root.Join("root")}
dirs := paths.PathList{RootApparmord, Root.Join("root"), Root.Join("systemd")}
for _, dir := range dirs {
if err := dir.RemoveAll(); err != nil {
return err
}
}
for _, path := range []string{"./apparmor.d", "./root"} {
cmd := exec.Command("rsync", "-a", path, Root.String())
if err := cmd.Run(); err != nil {
for _, name := range []string{"apparmor.d", "root"} {
if err := copyTo(paths.New(name), Root.Join(name)); err != nil {
return err
}
}

2
pkg/prebuild/tools.go
View file

@ -61,7 +61,7 @@ func getSupportedDistribution() string {
}
func copyTo(src *paths.Path, dst *paths.Path) error {
files, err := src.ReadDirRecursiveFiltered(nil, paths.FilterOutDirectories())
files, err := src.ReadDirRecursiveFiltered(nil, paths.FilterOutDirectories(), paths.FilterOutNames("README.md"))
if err != nil {
return err
}