mirror of
https://github.com/systemd/systemd
synced 2024-10-15 20:45:09 +00:00
meson: add journal-install and hwdb-update hooks
v2: - ignore errors in chown/chmod/setfacl - obey -Dadm-group=false, -Dwheel-group=false - fix reversed condition for systemd-hwdb update hook
This commit is contained in:
parent
abba22c51c
commit
f6e49d4e52
|
@ -25,6 +25,10 @@ if conf.get('ENABLE_HWDB', 0) == 1
|
|||
|
||||
meson.add_install_script('sh', '-c',
|
||||
mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
|
||||
.format(rootbindir))
|
||||
endif
|
||||
|
||||
############################################################
|
||||
|
|
|
@ -47,5 +47,5 @@ install_data('browse.html',
|
|||
meson.add_install_script('sh', '-c',
|
||||
mkdir_p.format('/var/log/journal/remote'))
|
||||
meson.add_install_script('sh', '-c',
|
||||
'''chown 0:0 $DESTDIR/var/log/journal/remote;
|
||||
chmod 755 $DESTDIR/var/log/journal/remote''')
|
||||
'chown 0:0 $DESTDIR/var/log/journal/remote &&
|
||||
chmod 755 $DESTDIR/var/log/journal/remote || :')
|
||||
|
|
|
@ -93,3 +93,17 @@ endif
|
|||
|
||||
install_data('journald.conf',
|
||||
install_dir : pkgsysconfdir)
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
mkdir_p.format('/var/log/journal'))
|
||||
meson.add_install_script('sh', '-c',
|
||||
'chown 0:0 $DESTDIR/var/log/journal &&
|
||||
chmod 755 $DESTDIR/var/log/journal || :')
|
||||
if get_option('adm-group')
|
||||
meson.add_install_script('sh', '-c',
|
||||
'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
|
||||
endif
|
||||
if get_option('wheel-group')
|
||||
meson.add_install_script('sh', '-c',
|
||||
'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue