On Thu, Sep 25, 2014 at 06:12:51PM -0300, Gustavo Sverzut Barbieri wrote: > move each user/group creation to a file that represents its own split > package, so it's possible to ship them in separate. > --- > Makefile.am | 33 +++++++++++++++++++++++++++++++-- > sysusers.d/systemd-journal-remote.conf | 9 +++++++++ > sysusers.d/systemd-journal-upload.conf | 8 ++++++++ > sysusers.d/systemd-journald.conf | 8 ++++++++ > sysusers.d/systemd-kdbus.conf | 8 ++++++++ > sysusers.d/systemd-networkd.conf | 8 ++++++++ > sysusers.d/systemd-remote.conf | 10 ---------- > sysusers.d/systemd-resolved.conf | 8 ++++++++ > sysusers.d/systemd-timesyncd.conf | 8 ++++++++ > sysusers.d/systemd.conf | 12 ------------ > 10 files changed, 88 insertions(+), 24 deletions(-) > create mode 100644 sysusers.d/systemd-journal-remote.conf > create mode 100644 sysusers.d/systemd-journal-upload.conf > create mode 100644 sysusers.d/systemd-journald.conf > create mode 100644 sysusers.d/systemd-kdbus.conf > create mode 100644 sysusers.d/systemd-networkd.conf > delete mode 100644 sysusers.d/systemd-remote.conf > create mode 100644 sysusers.d/systemd-resolved.conf > create mode 100644 sysusers.d/systemd-timesyncd.conf > delete mode 100644 sysusers.d/systemd.conf Hm, kdbus is either compiled in, or not, so splitting out configuration doesn't seem useful.
systemd-timesyncd is ~400kb. Other binaries aren't too big either. Splitting everything up complicated things, and I'm not convinced that this is a useful change. Zbyszek > > diff --git a/Makefile.am b/Makefile.am > index d8b7636..8a32880 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -2038,8 +2038,37 @@ SYSINIT_TARGET_WANTS += \ > systemd-sysusers.service > > dist_sysusers_DATA = \ > - sysusers.d/systemd.conf \ > - sysusers.d/systemd-remote.conf > + sysusers.d/systemd-journald.conf > + > +if HAVE_MICROHTTPD > +dist_sysusers_DATA += \ > + sysusers.d/systemd-journal-remote.conf > +endif > + > +if HAVE_LIBCURL > +dist_sysusers_DATA += \ > + sysusers.d/systemd-journal-upload.conf > +endif > + > +if ENABLE_KDBUS > +dist_sysusers_DATA += \ > + sysusers.d/systemd-kdbus.conf > +endif > + > +if ENABLE_NETWORKD > +dist_sysusers_DATA += \ > + sysusers.d/systemd-networkd.conf > +endif > + > +if ENABLE_RESOLVED > +dist_sysusers_DATA += \ > + sysusers.d/systemd-resolved.conf > +endif > + > +if ENABLE_TIMESYNCD > +dist_sysusers_DATA += \ > + sysusers.d/systemd-timesyncd.conf > +endif > > nodist_sysusers_DATA = \ > sysusers.d/basic.conf > diff --git a/sysusers.d/systemd-journal-remote.conf > b/sysusers.d/systemd-journal-remote.conf > new file mode 100644 > index 0000000..36bb51e > --- /dev/null > +++ b/sysusers.d/systemd-journal-remote.conf > @@ -0,0 +1,9 @@ > +# 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. > + > +u systemd-journal-gateway - "systemd Journal Gateway" > +u systemd-journal-remote - "systemd Journal Remote" > diff --git a/sysusers.d/systemd-journal-upload.conf > b/sysusers.d/systemd-journal-upload.conf > new file mode 100644 > index 0000000..927d400 > --- /dev/null > +++ b/sysusers.d/systemd-journal-upload.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +u systemd-journal-upload - "systemd Journal Upload" > diff --git a/sysusers.d/systemd-journald.conf > b/sysusers.d/systemd-journald.conf > new file mode 100644 > index 0000000..dcb01f6 > --- /dev/null > +++ b/sysusers.d/systemd-journald.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +g systemd-journal - - > diff --git a/sysusers.d/systemd-kdbus.conf b/sysusers.d/systemd-kdbus.conf > new file mode 100644 > index 0000000..13dce6a > --- /dev/null > +++ b/sysusers.d/systemd-kdbus.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +u systemd-bus-proxy - "systemd Bus Proxy" > diff --git a/sysusers.d/systemd-networkd.conf > b/sysusers.d/systemd-networkd.conf > new file mode 100644 > index 0000000..208148d > --- /dev/null > +++ b/sysusers.d/systemd-networkd.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +u systemd-network - "systemd Network Management" > diff --git a/sysusers.d/systemd-remote.conf b/sysusers.d/systemd-remote.conf > deleted file mode 100644 > index 15969e9..0000000 > --- a/sysusers.d/systemd-remote.conf > +++ /dev/null > @@ -1,10 +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. > - > -u systemd-journal-gateway - "systemd Journal Gateway" > -u systemd-journal-remote - "systemd Journal Remote" > -u systemd-journal-upload - "systemd Journal Upload" > diff --git a/sysusers.d/systemd-resolved.conf > b/sysusers.d/systemd-resolved.conf > new file mode 100644 > index 0000000..5872bf2 > --- /dev/null > +++ b/sysusers.d/systemd-resolved.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +u systemd-resolve - "systemd Resolver" > diff --git a/sysusers.d/systemd-timesyncd.conf > b/sysusers.d/systemd-timesyncd.conf > new file mode 100644 > index 0000000..4d7af7b > --- /dev/null > +++ b/sysusers.d/systemd-timesyncd.conf > @@ -0,0 +1,8 @@ > +# 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. > + > +u systemd-timesync - "systemd Time Synchronization" > diff --git a/sysusers.d/systemd.conf b/sysusers.d/systemd.conf > deleted file mode 100644 > index 95437b8..0000000 > --- a/sysusers.d/systemd.conf > +++ /dev/null > @@ -1,12 +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. > - > -g systemd-journal - - > -u systemd-bus-proxy - "systemd Bus Proxy" > -u systemd-network - "systemd Network Management" > -u systemd-resolve - "systemd Resolver" > -u systemd-timesync - "systemd Time Synchronization" > -- > 2.1.0 > > _______________________________________________ > systemd-devel mailing list > systemd-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/systemd-devel > _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel