diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 15:55:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 15:55:52 -0400 |
| commit | 1ff57cf08fa861fd0b7ec37e12ec199b4d0a7d39 (patch) | |
| tree | c55334413e7c26a31336ac12873468f8f43d3853 | |
| parent | a20fc02bda77dea232b0e3eb82dca9bef7dc3861 (diff) | |
| parent | fb2df8a67e5a6dba2189719669f86fa5404d7983 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
| -rwxr-xr-x | tools/notsd-fixup | 2 | ||||
| -rwxr-xr-x | tools/notsd-move | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/notsd-fixup b/tools/notsd-fixup index 820d2fec17..af0fdbf9d4 100755 --- a/tools/notsd-fixup +++ b/tools/notsd-fixup @@ -19,7 +19,7 @@ main() { find "$@" -type l -name GNUmakefile -delete # It's OK for the top-level one to fail find "$@" -type f -name Makefile -printf '%h\0' | - xargs -r0 -I {} ln -s -t {} GNUmakefile + xargs -r0 -I {} ln -s -r -t {} GNUmakefile # C includes rm -rf -- "$0"--includes.cache diff --git a/tools/notsd-move b/tools/notsd-move index ad638a2e63..30f63d354f 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -359,7 +359,7 @@ move_files() ( src/login/*.rules \ src/login/*.rules.in \ src/login/org.* - mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4 + mv -T src/login/systemd-user.m4 src/pam_systemd/systemd-user.pam.m4 rmdir src/login # src/timedate => src/... |