shutdown: rearrange shutdown sources in source tree

Let's move the shutdown binary into its own subdirectory in
src/shutdown, after all it is relatively isolated from the normal PID 1
sources, being a different binary and all.

Unfortunately it's not possible to move some of the code, since it is
shared with PID 1, that I wished we could move, but I still think it's
worth it.
This commit is contained in:
Lennart Poettering 2019-03-05 12:12:33 +01:00
parent 3a736a3216
commit 9e71f5d983
7 changed files with 13 additions and 12 deletions

View File

@ -1441,6 +1441,7 @@ includes = include_directories('src/basic',
'src/udev',
'src/libudev',
'src/core',
'src/shutdown',
'src/libsystemd/sd-bus',
'src/libsystemd/sd-device',
'src/libsystemd/sd-event',
@ -1527,6 +1528,7 @@ public_programs = []
subdir('src/libudev')
subdir('src/shared')
subdir('src/core')
subdir('src/shutdown')
subdir('src/udev')
subdir('src/network')
@ -2676,6 +2678,10 @@ public_programs += exe
executable('systemd-shutdown',
systemd_shutdown_sources,
'src/core/mount-setup.c',
'src/core/mount-setup.h',
'src/core/killall.c',
'src/core/killall.h',
include_directories : includes,
link_with : [libshared],
dependencies : [libmount],

View File

@ -163,16 +163,6 @@ libcore = static_library(
systemd_sources = files('main.c')
systemd_shutdown_sources = files('''
shutdown.c
umount.c
umount.h
mount-setup.c
mount-setup.h
killall.c
killall.h
'''.split())
in_files = [['macros.systemd', rpmmacrosdir],
['system.conf', pkgsysconfdir],
['systemd.pc', pkgconfigdatadir],

5
src/shutdown/meson.build Normal file
View File

@ -0,0 +1,5 @@
systemd_shutdown_sources = files('''
shutdown.c
umount.c
umount.h
'''.split())

View File

@ -716,8 +716,8 @@ tests += [
[['src/test/test-umount.c',
'src/core/mount-setup.c',
'src/core/mount-setup.h',
'src/core/umount.c',
'src/core/umount.h'],
'src/shutdown/umount.c',
'src/shutdown/umount.h'],
[],
[libmount]],