[systemd-devel] [PATCH 1/2] tmpfiles.d: split files to cope with split packages.
Zbigniew Jędrzejewski-Szmek
zbyszek at in.waw.pl
Mon Sep 29 19:26:38 PDT 2014
On Thu, Sep 25, 2014 at 06:12:50PM -0300, Gustavo Sverzut Barbieri wrote:
> etc.conf was selectively (using m4) using resolved link, now this is
> moved to systemd-resolved.conf file. The etc.conf can be static and
> does not need to be generated anymore.
>
> systemd.conf was doing all the journal setup, now this is moved to
> systemd-journald.conf file.
Is this useful? We don't support journald-less setups.
> systemd-remote.conf was renamed to systemd-journal-remote.conf for
> conssitency.
This doesn't feel right either. systemd-remote.conf is not only
for systemd-journal-remote, but also for systemd-journal-upload
and systemd-journal-gateway, so the rename would be misleading.
Current name is also the same as the name of the directory (src/journal-remote),
so even if not perfect, it is not accidental.
> systemd.conf was doing all the networkd setup, now this is moved to
> systemd-networkd.conf file.
This part probably makes the most sense, since networkd is largely
a separate beast.
Those filenames form a kind of an interface, since they are overriden
by name, so we shouldn't change them lightly.
Can you respin the patch with just the networkd change?
Zbyszek
> ---
> Makefile.am | 25 +++++++++++++++++--------
> tmpfiles.d/.gitignore | 1 -
> tmpfiles.d/etc.conf | 15 +++++++++++++++
> tmpfiles.d/etc.conf.m4 | 17 -----------------
> tmpfiles.d/systemd-journal-remote.conf | 11 +++++++++++
> tmpfiles.d/systemd-journald.conf | 14 ++++++++++++++
> tmpfiles.d/systemd-networkd.conf | 12 ++++++++++++
> tmpfiles.d/systemd-remote.conf | 11 -----------
> tmpfiles.d/systemd-resolved.conf | 10 ++++++++++
> tmpfiles.d/systemd.conf | 9 ---------
> 10 files changed, 79 insertions(+), 46 deletions(-)
> delete mode 100644 tmpfiles.d/.gitignore
> create mode 100644 tmpfiles.d/etc.conf
> delete mode 100644 tmpfiles.d/etc.conf.m4
> create mode 100644 tmpfiles.d/systemd-journal-remote.conf
> create mode 100644 tmpfiles.d/systemd-journald.conf
> create mode 100644 tmpfiles.d/systemd-networkd.conf
> delete mode 100644 tmpfiles.d/systemd-remote.conf
> create mode 100644 tmpfiles.d/systemd-resolved.conf
>
> diff --git a/Makefile.am b/Makefile.am
> index 52f578b..d8b7636 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1967,17 +1967,30 @@ nodist_systemunit_DATA += \
> units/systemd-tmpfiles-setup.service \
> units/systemd-tmpfiles-clean.service
>
> -nodist_tmpfiles_DATA = \
> - tmpfiles.d/etc.conf
> -
> dist_tmpfiles_DATA = \
> + tmpfiles.d/etc.conf \
> tmpfiles.d/systemd.conf \
> tmpfiles.d/systemd-nologin.conf \
> - tmpfiles.d/systemd-remote.conf \
> + tmpfiles.d/systemd-journald.conf \
> tmpfiles.d/tmp.conf \
> tmpfiles.d/x11.conf \
> tmpfiles.d/var.conf
>
> +if HAVE_MICROHTTPD
> +dist_tmpfiles_DATA += \
> + tmpfiles.d/systemd-journal-remote.conf
> +endif
> +
> +if ENABLE_NETWORKD
> +dist_tmpfiles_DATA += \
> + tmpfiles.d/systemd-networkd.conf
> +endif
> +
> +if ENABLE_RESOLVED
> +dist_tmpfiles_DATA += \
> + tmpfiles.d/systemd-resolved.conf
> +endif
> +
> if HAVE_SYSV_COMPAT
> dist_tmpfiles_DATA += \
> tmpfiles.d/legacy.conf
> @@ -1999,14 +2012,10 @@ INSTALL_DIRS += \
> endif
>
> EXTRA_DIST += \
> - tmpfiles.d/etc.conf.m4 \
> units/systemd-tmpfiles-setup-dev.service.in \
> units/systemd-tmpfiles-setup.service.in \
> units/systemd-tmpfiles-clean.service.in
>
> -CLEANFILES += \
> - tmpfiles.d/etc.conf
> -
> # ------------------------------------------------------------------------------
> if ENABLE_SYSUSERS
> systemd_sysusers_SOURCES = \
> diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore
> deleted file mode 100644
> index eb32315..0000000
> --- a/tmpfiles.d/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -etc.conf
> diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf
> new file mode 100644
> index 0000000..88ad78e
> --- /dev/null
> +++ b/tmpfiles.d/etc.conf
> @@ -0,0 +1,15 @@
> +# This file is part of systemd.
> +#
> +# systemd is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as published by
> +# the Free Software Foundation; either version 2.1 of the License, or
> +# (at your option) any later version.
> +
> +# See tmpfiles.d(5) for details
> +
> +L /etc/os-release - - - - ../usr/lib/os-release
> +L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
> +L+ /etc/mtab - - - - ../proc/self/mounts
> +
> +C /etc/nsswitch.conf - - - -
> +C /etc/pam.d - - - -
> diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
> deleted file mode 100644
> index f567c8d..0000000
> --- a/tmpfiles.d/etc.conf.m4
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -# This file is part of systemd.
> -#
> -# systemd is free software; you can redistribute it and/or modify it
> -# under the terms of the GNU Lesser General Public License as published by
> -# the Free Software Foundation; either version 2.1 of the License, or
> -# (at your option) any later version.
> -
> -# See tmpfiles.d(5) for details
> -
> -L /etc/os-release - - - - ../usr/lib/os-release
> -L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
> -L+ /etc/mtab - - - - ../proc/self/mounts
> -m4_ifdef(`ENABLE_RESOLVED',
> -L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
> -)
> -C /etc/nsswitch.conf - - - -
> -C /etc/pam.d - - - -
> diff --git a/tmpfiles.d/systemd-journal-remote.conf b/tmpfiles.d/systemd-journal-remote.conf
> new file mode 100644
> index 0000000..1b8973a
> --- /dev/null
> +++ b/tmpfiles.d/systemd-journal-remote.conf
> @@ -0,0 +1,11 @@
> +# This file is part of systemd.
> +#
> +# systemd is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as published by
> +# the Free Software Foundation; either version 2.1 of the License, or
> +# (at your option) any later version.
> +
> +# See tmpfiles.d(5) for details
> +
> +z /var/log/journal/remote 2755 root systemd-journal-remote - -
> +z /run/log/journal/remote 2755 root systemd-journal-remote - -
> diff --git a/tmpfiles.d/systemd-journald.conf b/tmpfiles.d/systemd-journald.conf
> new file mode 100644
> index 0000000..576dac4
> --- /dev/null
> +++ b/tmpfiles.d/systemd-journald.conf
> @@ -0,0 +1,14 @@
> +# This file is part of systemd.
> +#
> +# systemd is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as published by
> +# the Free Software Foundation; either version 2.1 of the License, or
> +# (at your option) any later version.
> +
> +# See tmpfiles.d(5) for details
> +
> +z /run/log/journal 2755 root systemd-journal - -
> +Z /run/log/journal/%m ~2750 root systemd-journal - -
> +
> +z /var/log/journal 2755 root systemd-journal - -
> +z /var/log/journal/%m 2755 root systemd-journal - -
> diff --git a/tmpfiles.d/systemd-networkd.conf b/tmpfiles.d/systemd-networkd.conf
> new file mode 100644
> index 0000000..2419755
> --- /dev/null
> +++ b/tmpfiles.d/systemd-networkd.conf
> @@ -0,0 +1,12 @@
> +# This file is part of systemd.
> +#
> +# systemd is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as published by
> +# the Free Software Foundation; either version 2.1 of the License, or
> +# (at your option) any later version.
> +
> +# See tmpfiles.d(5) for details
> +
> +d /run/systemd/netif 0755 systemd-network systemd-network -
> +d /run/systemd/netif/links 0755 systemd-network systemd-network -
> +d /run/systemd/netif/leases 0755 systemd-network systemd-network -
> diff --git a/tmpfiles.d/systemd-remote.conf b/tmpfiles.d/systemd-remote.conf
> deleted file mode 100644
> index 1b8973a..0000000
> --- a/tmpfiles.d/systemd-remote.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -# This file is part of systemd.
> -#
> -# systemd is free software; you can redistribute it and/or modify it
> -# under the terms of the GNU Lesser General Public License as published by
> -# the Free Software Foundation; either version 2.1 of the License, or
> -# (at your option) any later version.
> -
> -# See tmpfiles.d(5) for details
> -
> -z /var/log/journal/remote 2755 root systemd-journal-remote - -
> -z /run/log/journal/remote 2755 root systemd-journal-remote - -
> diff --git a/tmpfiles.d/systemd-resolved.conf b/tmpfiles.d/systemd-resolved.conf
> new file mode 100644
> index 0000000..632407a
> --- /dev/null
> +++ b/tmpfiles.d/systemd-resolved.conf
> @@ -0,0 +1,10 @@
> +# This file is part of systemd.
> +#
> +# systemd is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as published by
> +# the Free Software Foundation; either version 2.1 of the License, or
> +# (at your option) any later version.
> +
> +# See tmpfiles.d(5) for details
> +
> +L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
> diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
> index 9ca5ad2..9f847a9 100644
> --- a/tmpfiles.d/systemd.conf
> +++ b/tmpfiles.d/systemd.conf
> @@ -16,17 +16,8 @@ d /run/systemd/sessions 0755 root root -
> d /run/systemd/users 0755 root root -
> d /run/systemd/machines 0755 root root -
> d /run/systemd/shutdown 0755 root root -
> -d /run/systemd/netif 0755 systemd-network systemd-network -
> -d /run/systemd/netif/links 0755 systemd-network systemd-network -
> -d /run/systemd/netif/leases 0755 systemd-network systemd-network -
>
> d /run/log 0755 root root -
>
> -z /run/log/journal 2755 root systemd-journal - -
> -Z /run/log/journal/%m ~2750 root systemd-journal - -
> -
> -z /var/log/journal 2755 root systemd-journal - -
> -z /var/log/journal/%m 2755 root systemd-journal - -
> -
> d /var/lib/systemd 0755 root root -
> d /var/lib/systemd/coredump 0755 root root 3d
> --
> 2.1.0
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
>
More information about the systemd-devel
mailing list