Re: [systemd-devel] 2nd X session manager
Hi On Sun, Sep 28, 2014 at 10:45 PM, Thomas Antony tho...@antony.eu wrote: Hi, I'm running Fedora 20. How do i start automatically a second default X session manager on vt2 with systemd? This depends on the session-manager you use.. but as a heads-up: most session-managers only allow a single instance per seat (which makes sense..). Thanks David ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] 2nd X session manager
Hi (please put the mailing-list on CC; or use Reply-All) On Mon, Sep 29, 2014 at 9:49 AM, Thomas Antony tho...@antony.eu wrote: Hi, This depends on the session-manager you use.. but as a heads-up: most session-managers only allow a single instance per seat (which makes sense..). I have installed Gnome and gdm. I'm using the Gnome autologon feature and starting automatically an application after logon which should not get closed. So i thought i could start an additional X session manager on vt2 and logon to this one with a different user. So how this should work is gdm start on VT1, the auto-login session on VT2 and if you want to login again, you switch to gdm and start a new login. I don't think you can run gdm multiple times, and I'm also not sure how to tell gdm to start new sessions on new VTs. Yeah, a lot of things I don't know.. but that's really questions you should ask Gnome and GDM people, not us. Sorry! Thanks David ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] 2nd X session manager
David Herrmann wrote on 29/09/14 08:53: Hi (please put the mailing-list on CC; or use Reply-All) On Mon, Sep 29, 2014 at 9:49 AM, Thomas Antony tho...@antony.eu wrote: Hi, This depends on the session-manager you use.. but as a heads-up: most session-managers only allow a single instance per seat (which makes sense..). I have installed Gnome and gdm. I'm using the Gnome autologon feature and starting automatically an application after logon which should not get closed. So i thought i could start an additional X session manager on vt2 and logon to this one with a different user. So how this should work is gdm start on VT1, the auto-login session on VT2 and if you want to login again, you switch to gdm and start a new login. I don't think you can run gdm multiple times, and I'm also not sure how to tell gdm to start new sessions on new VTs. Yeah, a lot of things I don't know.. but that's really questions you should ask Gnome and GDM people, not us. Sorry! FWIW, from either the logged in session or it's lock screen (if the user has locked it) just select the Switch User function (either in the user menu in the top right if logged in, or the big button from the lock screen). This will tell GDM to spawn a new login manager for you. I asked a log time ago if we could have some kind of autospawning of a gdm screen on tty2 as soon as you switch to it (much like getty will autospawn). I don't think it would be too hard to glue that together these days, but not sure anyone has done that. Col -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited http://www.tribalogic.net/ Open Source: Mageia Contributor http://www.mageia.org/ PulseAudio Hacker http://www.pulseaudio.org/ Trac Hacker http://trac.edgewall.org/ ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] swap: introduce Discard property
Jan Synacek jsyna...@redhat.com writes: Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl writes: On Wed, Sep 24, 2014 at 02:29:05PM +0200, Jan Synacek wrote: Process possible discard values from /etc/fstab. Hm, wouldn't it be enough to simply pass through the options like with mounts, using the Options= option? This might be less work and be more flexible. Zbyszek Swap options are special in that they're processed and used by the swapon(8) command. You cannot pass swapon -o options, as you can to ordinary mounts. And how many options for swapon, that at the same time can be specified in /etc/fstab, do we really care about? I'm not sure. Ping, could anybody comment, please? -- Jan Synacek Software Engineer, Red Hat ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] swap: introduce Discard property
On Mon, Sep 29, 2014 at 01:23:30PM +0200, Jan Synacek wrote: Jan Synacek jsyna...@redhat.com writes: Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl writes: On Wed, Sep 24, 2014 at 02:29:05PM +0200, Jan Synacek wrote: Process possible discard values from /etc/fstab. Hm, wouldn't it be enough to simply pass through the options like with mounts, using the Options= option? This might be less work and be more flexible. Zbyszek Swap options are special in that they're processed and used by the swapon(8) command. You cannot pass swapon -o options, as you can to ordinary mounts. And how many options for swapon, that at the same time can be specified in /etc/fstab, do we really care about? I'm not sure. Ping, could anybody comment, please? C'mon, it's been four days, two of that being the weekend. But actually, I've been looking at your patch... and the situation is complicated. I now have a patch series which fixes a buglets in swap support, but I got stuck on a one which I don't know how to work around. Namely, we rely on being able to read back the settings of the swap device, but there appears to be no way to do that for discard settings. Zbyszek ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] Race condition on systemd-run --scope
Hi, I have stumbled on a race condition on systemd-run --scope command. Due to race condition, unit might show up as active/running even though there is no process in the cgroup. My best guess is we are missing the cgroup notification but when? - Could it be that before systemd processes StartTransientUnit message, before systemd places PID to the .scope cgroup folder, process exits? - Could it be that systemd somehow, occasionally misses the notification sent from cgroup. Before I go deep, does anyone have any idea? Once the race happens, following is the output of show and status commands. Notice there is no process in the output of status. 'systemctl status aa_40.scope' gives: ● aa_40.scope - AA application 'aa_40' Loaded: loaded (/run/systemd/system/aa_40.scope; static) Drop-In: /run/systemd/system/aa_40.scope.d └─50-Description.conf Active: active (running) since Fri 2014-09-26 13:59:32 GMT; 40min ago Sep 26 13:59:32 axis-00408cc5a884 systemd[1]: Started AA application 'aa_40'. 'systemctl show aa_40.scope' gives: TimeoutStopUSec=1min 30s Result=success Slice=system.slice ControlGroup=/system.slice/aa_40.scope CPUAccounting=no CPUShares=18446744073709551615 StartupCPUShares=18446744073709551615 CPUQuotaPerSecUSec=(null) BlockIOAccounting=no BlockIOWeight=18446744073709551615 StartupBlockIOWeight=18446744073709551615 MemoryAccounting=no MemoryLimit=18446744073709551615 DevicePolicy=auto KillMode=control-group KillSignal=15 SendSIGKILL=yes SendSIGHUP=no Id=aa_40.scope Names=aa_40.scope Wants=system.slice Conflicts=shutdown.target Before=shutdown.target After=system.slice Description=AA application 'aa_40' LoadState=loaded ActiveState=active SubState=running FragmentPath=/run/systemd/system/aa_40.scope DropInPaths=/run/systemd/system/aa_40.scope.d/50-Description.conf UnitFileState=static InactiveExitTimestamp=Fri 2014-09-26 13:59:32 GMT InactiveExitTimestampMonotonic=73340355 ActiveEnterTimestamp=Fri 2014-09-26 13:59:32 GMT ActiveEnterTimestampMonotonic=73340355 ActiveExitTimestampMonotonic=0 InactiveEnterTimestampMonotonic=0 CanStart=yes CanStop=yes CanReload=no CanIsolate=no StopWhenUnneeded=no RefuseManualStart=no RefuseManualStop=no AllowIsolate=no DefaultDependencies=yes OnFailureJobMode=replace IgnoreOnIsolate=yes IgnoreOnSnapshot=yes NeedDaemonReload=no JobTimeoutUSec=0 ConditionResult=yes ConditionTimestamp=Fri 2014-09-26 13:59:32 GMT ConditionTimestampMonotonic=73303280 Transient=yes Thanks, Umut ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] swap: introduce Discard property
В Mon, 29 Sep 2014 17:16:25 +0200 Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl пишет: The problem with reading but back discards settings remains. Seems like the most natural solution is to extend /proc/swaps. The only place where these flags are printed right now is in dmesg during swapon. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] swap: introduce Discard property
On Mon, Sep 29, 2014 at 08:35:04PM +0400, Andrei Borzenkov wrote: В Mon, 29 Sep 2014 17:16:25 +0200 Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl пишет: The problem with reading but back discards settings remains. Seems like the most natural solution is to extend /proc/swaps. The only place where these flags are printed right now is in dmesg during swapon. Yeah, but how can you extend /proc/swaps in a backwards compatible way? Like many kernel interfaces, it was designed with no thought towards extensibility. A new file would have to be created (/proc/swapinfo?). The advantage would be that all the flags could be exposed. This new file could probably be also used to expose information about zswap friends. Zbyszek ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] Timed out waiting for device dev-disk-by...
Hi, I get a timeout in the Fedora 21 alpha: [ TIME ] Timed out waiting for device dev-disk-by\x2duuid-008af19d\x2d2562\x2d49bd\x2d8907\x2d721ea08f3e14.device. But all devices are available from early kernel start: # ls -l /dev/disk/by-uuid/ total 0 lrwxrwxrwx 1 root root 11 Sep 29 20:17 008af19d-2562-49bd-8907-721ea08f3e14 - ../../ubda1 lrwxrwxrwx 1 root root 11 Sep 29 20:17 e2bffa45-d84f-47bc-81ba-e7a395751fa6 - ../../ubda3 lrwxrwxrwx 1 root root 11 Sep 29 20:17 f452f020-a446-41ed-93c0-ee5ce56d6ea4 - ../../ubda2 It feels like some event notification is lost in the boot process or something like this?! What exactly makes the device unit go into the state active/plugged? This is a boot of the Fedora 21 alpha under user mode linux. Any ideas what could be wrong here? with kind regards thomas ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [systemd-commits] 2 commits - src/nspawn src/shared
On Mon, Sep 29, 2014 at 11:55:09AM -0700, Tom Gundersen wrote: src/nspawn/nspawn.c | 13 ++--- src/shared/util.c | 18 ++ 2 files changed, 24 insertions(+), 7 deletions(-) New commits: commit 9fb02b1d5df153aa522256aec821e422cca7f284 Author: Tom Gundersen t...@jklm.no Date: Mon Sep 29 14:30:15 2014 +0200 util: silence coverity Make it clear in the code that ignoring a failed safe_ato?() is intentional. diff --git a/src/shared/util.c b/src/shared/util.c index 30b0364..ec33fc1 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3272,8 +3272,13 @@ unsigned columns(void) { c = 0; e = getenv(COLUMNS); -if (e) -safe_atoi(e, c); +if (e) { +int r; + +r = safe_atoi(e, c); +if (r 0) {} +/* do nothing, we fall back to c = 0 */ Why not just say: (void) safe_atoi(e, c); ? Zbyszek +} if (c = 0) c = fd_columns(STDOUT_FILENO); @@ -3306,8 +3311,13 @@ unsigned lines(void) { l = 0; e = getenv(LINES); -if (e) -safe_atou(e, l); +if (e) { +int r; + +r = safe_atou(e, l); +if (r 0) {} +/* do nothing, we fall back to l = 0 */ +} if (l = 0) l = fd_lines(STDOUT_FILENO); commit e8c8ddccfc63574069c30b7e75f0ccfd5b03eab9 Author: Tom Gundersen t...@jklm.no Date: Mon Sep 29 13:20:54 2014 +0200 nspawn: log when tearing down of loop device fails diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 4c1cfab..34436b8 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2607,20 +2607,27 @@ static int mount_devices( static void loop_remove(int nr, int *image_fd) { _cleanup_close_ int control = -1; +int r; if (nr 0) return; if (image_fd *image_fd = 0) { -ioctl(*image_fd, LOOP_CLR_FD); +r = ioctl(*image_fd, LOOP_CLR_FD); +if (r 0) +log_warning(Failed to close loop image: %m); *image_fd = safe_close(*image_fd); } control = open(/dev/loop-control, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); -if (control 0) +if (control 0) { +log_warning(Failed to open /dev/loop-control: %m); return; +} -ioctl(control, LOOP_CTL_REMOVE, nr); +r = ioctl(control, LOOP_CTL_REMOVE, nr); +if (r 0) +log_warning(Failed to remove loop %d: %m, nr); } static int spawn_getent(const char *database, const char *key, pid_t *rpid) { ___ systemd-commits mailing list systemd-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-commits ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH 1/2] tmpfiles.d: split files to cope with split packages.
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. systemd-remote.conf was renamed to systemd-journal-remote.conf for conssitency. systemd.conf was doing all the networkd setup, now this is moved to systemd-networkd.conf file. no comments, could you apply it? :-) --- 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..000 --- 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 000..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..000 --- 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 000..1b8973a --- /dev/null +++ b/tmpfiles.d/systemd-journal-remote.conf @@ -0,0 +1,11 @@ +# This file is
Re: [systemd-devel] Timed out waiting for device dev-disk-by...
On Mon, Sep 29, 2014 at 8:29 PM, Thomas Meyer tho...@m3y3r.de wrote: Hi, I get a timeout in the Fedora 21 alpha: [ TIME ] Timed out waiting for device dev-disk-by\x2duuid-008af19d\x2d2562\x2d49bd\x2d8907\x2d721ea08f3e14.device. But all devices are available from early kernel start: # ls -l /dev/disk/by-uuid/ total 0 lrwxrwxrwx 1 root root 11 Sep 29 20:17 008af19d-2562-49bd-8907-721ea08f3e14 - ../../ubda1 lrwxrwxrwx 1 root root 11 Sep 29 20:17 e2bffa45-d84f-47bc-81ba-e7a395751fa6 - ../../ubda3 lrwxrwxrwx 1 root root 11 Sep 29 20:17 f452f020-a446-41ed-93c0-ee5ce56d6ea4 - ../../ubda2 It feels like some event notification is lost in the boot process or something like this?! What exactly makes the device unit go into the state active/plugged? This is a boot of the Fedora 21 alpha under user mode linux. Any ideas what could be wrong here? Please always CC me and/or the UML mailinglist in case of UML related issues. I'm very interested in having UML work with systemd. -- Thanks, //richard ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH 2/2] sysusers.d: split files to cope with split packages.
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 000..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 000..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 000..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 000..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 000..208148d ---
Re: [systemd-devel] [PATCH 1/2] tmpfiles.d: split files to cope with split packages.
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..000 --- 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 000..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..000 --- 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
Re: [systemd-devel] [PATCH] shutdown: pass own argv to /run/initramfs/shutdown
On Fri, Aug 29, 2014 at 05:51:45PM +0200, Marius Tessmann wrote: Since commit b1e90ec515408aec2702522f6f68c4920b56375b systemd passes its log settings to systemd-shutdown via command line parameters. However, systemd-shutdown doesn't pass these parameters to /run/initramfs/shutdown, causing it to fall back to the default log settings. Hi, sorry for the late reply. Your patch should work fine if /run/initramfs/shutdown accepts those arguments, i.e. if it another systemd binary. But otherwise it might fail, no? Zbyszek This fixes the following bugs about the shutdown not being quiet despite quiet being in the kernel parameters: https://bugs.freedesktop.org/show_bug.cgi?id=79582 https://bugs.freedesktop.org/show_bug.cgi?id=57216 --- src/core/shutdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/shutdown.c b/src/core/shutdown.c index 1e88b05..d361cbe 100644 --- a/src/core/shutdown.c +++ b/src/core/shutdown.c @@ -313,7 +313,7 @@ int main(int argc, char *argv[]) { access(/run/initramfs/shutdown, X_OK) == 0) { r = switch_root_initramfs(); if (r = 0) { -arguments[0] = (char*) /shutdown; +argv[0] = (char*) /shutdown; setsid(); make_console_stdio(); @@ -321,7 +321,7 @@ int main(int argc, char *argv[]) { log_info(Successfully changed into root pivot.\n Returning to initrd...); -execv(/shutdown, arguments); +execv(/shutdown, argv); log_error(Failed to execute shutdown binary: %m); } else log_error(Failed to switch root to \/run/initramfs\: %s, strerror(-r)); -- 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
Re: [systemd-devel] [PATCH] swap: introduce Discard property
Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl writes: On Mon, Sep 29, 2014 at 01:23:30PM +0200, Jan Synacek wrote: Ping, could anybody comment, please? C'mon, it's been four days, two of that being the weekend. Sorry for that, it felt like way over a week already... -- Jan Synacek Software Engineer, Red Hat ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel