diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 03:11:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 03:11:52 -0500 |
| commit | b849891b5dde5ee14ab8b7b7db74e65a4a38d993 (patch) | |
| tree | 29bb0e6fda9b4b170041913de495da057bbe3621 /tools | |
| parent | 004efebf9cc559ea131bb9460ee0ee198e2d5da7 (diff) | |
| parent | 881228ff72434a0e3401a16bd87f179ef0ab1619 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-journal/libjournal-core/.gitignore
# src/grp-system/libcore/include/core/mount.h
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/notsd-move | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/notsd-move b/tools/notsd-move index 096c3d8338..3d3205262f 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -75,6 +75,7 @@ move_files() ( mv -T src/{,systemd-}initctl mv -T src/{,systemd-}machine-id-setup mv -T src/{,systemd-}modules-load + mv -T src/{,systemd-}mount mv -T src/{,systemd-}notify mv -T src/{,systemd-}nspawn mv -T src/{,systemd-}path @@ -701,6 +702,7 @@ move_files() ( rmdir src/grp-journal/catalog mv -t src/systemd-timesyncd system-preset/??-timesyncd.preset + mv -t src/grp-journal/grp-remote system-preset/??-journal-remote.preset for file in system-preset/??-*.preset; do base="${file##*/??-}" base="${base%.preset}" |