Accepting request 106439 from Base:System

Added a patch to correct the path to the plymouth binaries (changed to /usr/...) and also to make the two plymouth-quit*.services conflicting with the graphical.target. This would quit plymouth when running in runlevel 3 (non-graphical), but leaves the killing of plymouth up to the displaymanager when running in the graphical target. (forwarded request 106382 from tittiatcoke)

OBS-URL: https://build.opensuse.org/request/show/106439
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=90

correct_plymouth_paths_and_conflicts.patch

@@ -0,0 +1,90 @@
+--- systemd-43/units/plymouth-halt.service	2012-02-15 04:27:59.626029851 +0100
++++ new/units/plymouth-halt.service	2012-02-21 18:28:16.225983153 +0100
+@@ -13,6 +13,6 @@
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+ [Service]
+-ExecStart=/sbin/plymouthd --mode=shutdown
+-ExecStartPost=-/bin/plymouth --show-splash
++ExecStart=/usr/sbin/plymouthd --mode=shutdown
++ExecStartPost=-/usr/bin/plymouth --show-splash
+ Type=forking
+--- systemd-43/units/plymouth-kexec.service	2012-02-15 04:27:59.452029843 +0100
++++ new/units/plymouth-kexec.service	2012-02-21 18:28:36.056981567 +0100
+@@ -13,6 +13,6 @@
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+ [Service]
+-ExecStart=/sbin/plymouthd --mode=shutdown
+-ExecStartPost=-/bin/plymouth --show-splash
++ExecStart=/usr/sbin/plymouthd --mode=shutdown
++ExecStartPost=-/usr/bin/plymouth --show-splash
+ Type=forking
+--- systemd-43/units/plymouth-poweroff.service	2012-02-15 04:28:00.144029876 +0100
++++ new/units/plymouth-poweroff.service	2012-02-21 18:28:45.495981246 +0100
+@@ -13,6 +13,6 @@
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+ [Service]
+-ExecStart=/sbin/plymouthd --mode=shutdown
+-ExecStartPost=-/bin/plymouth --show-splash
++ExecStart=/usr/sbin/plymouthd --mode=shutdown
++ExecStartPost=-/usr/bin/plymouth --show-splash
+ Type=forking
+--- systemd-43/units/plymouth-quit.service	2012-02-15 04:28:00.134029876 +0100
++++ new/units/plymouth-quit.service	2012-02-21 18:29:00.855980323 +0100
+@@ -8,8 +8,9 @@
+ [Unit]
+ Description=Terminate Plymouth Boot Screen
+ After=rc-local.service plymouth-start.service
++Conflicts=graphical.target
+ 
+ [Service]
+-ExecStart=-/bin/plymouth quit
++ExecStart=-/usr/bin/plymouth quit
+ Type=oneshot
+ TimeoutSec=20
+--- systemd-43/units/plymouth-quit-wait.service	2012-02-15 04:27:59.894029864 +0100
++++ new/units/plymouth-quit-wait.service	2012-02-21 18:29:14.904979438 +0100
+@@ -8,8 +8,9 @@
+ [Unit]
+ Description=Wait for Plymouth Boot Screen to Quit
+ After=rc-local.service plymouth-start.service
++Conflicts=graphical.target
+ 
+ [Service]
+-ExecStart=-/bin/plymouth --wait
++ExecStart=-/usr/bin/plymouth --wait
+ Type=oneshot
+ TimeoutSec=20
+--- systemd-43/units/plymouth-read-write.service	2012-02-15 04:27:59.457029843 +0100
++++ new/units/plymouth-read-write.service	2012-02-21 18:29:29.439978464 +0100
+@@ -12,5 +12,5 @@
+ Before=sysinit.target
+ 
+ [Service]
+-ExecStart=-/bin/plymouth update-root-fs --read-write
++ExecStart=-/usr/bin/plymouth update-root-fs --read-write
+ Type=oneshot
+--- systemd-43/units/plymouth-reboot.service	2012-02-15 04:28:00.149029877 +0100
++++ new/units/plymouth-reboot.service	2012-02-21 18:29:43.718977613 +0100
+@@ -13,6 +13,6 @@
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+ [Service]
+-ExecStart=/sbin/plymouthd --mode=shutdown
+-ExecStartPost=-/bin/plymouth --show-splash
++ExecStart=/usr/sbin/plymouthd --mode=shutdown
++ExecStartPost=-/usr/bin/plymouth --show-splash
+ Type=forking
+--- systemd-43/units/plymouth-start.service	2012-02-15 04:28:00.174029878 +0100
++++ new/units/plymouth-start.service	2012-02-21 18:30:01.994976517 +0100
+@@ -17,6 +17,6 @@
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+ [Service]
+-ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
+-ExecStartPost=-/bin/plymouth --show-splash
++ExecStart=/usr/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
++ExecStartPost=-/usr/bin/plymouth --show-splash
+ Type=forking

listen.conf

@@ -1 +0,0 @@
-$SystemLogSocketName /run/systemd/journal/syslog

systemd-42.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dc107d488d823eb2203b6f1567096749ea37c1cf9022a6b0507ec07691e0ec2
-size 854808

systemd-43.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3070e48e43bc0811fa8da5ba4832a11dac73b1625db94d42d4c15dc279335dd7
+size 852432

systemd-gtk.changes

@@ -1,8 +1,30 @@
+-------------------------------------------------------------------
+Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
+
+- Remove rsyslog listen.conf, handled directly by rsyslog now
+  (bnc#747871).
+
+-------------------------------------------------------------------
+Mon Feb 20 13:33:45 UTC 2012 - fcrozat@suse.com
+
+- Update to version 43:
+  + requires /etc/os-release, support for /etc/SuSE-release is no
+    longer present.
+  + Track class of PAM logins to distinguish greeters from normal
+    user logins.
+  + Various bug fixes.
+
 -------------------------------------------------------------------
 Sun Feb 19 07:56:05 UTC 2012 - jengelh@medozas.de
 
 - Use pkgconfig symbols for BuildRequires and specify version
-- Add missing kmod BuildRequires for systemd-gtk
+
+-------------------------------------------------------------------
+Fri Feb 17 09:22:50 UTC 2012 - tittiatcoke@gmail.com
+
+- Enable Plymouth integration. 
+  * Bootsplash related files will be moved to the bootsplash
+    package
 
 -------------------------------------------------------------------
 Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com

systemd-gtk.spec

@@ -15,9 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           systemd-gtk
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        42
+Version:        43
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audit-devel

systemd.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
+
+- Remove rsyslog listen.conf, handled directly by rsyslog now
+  (bnc#747871).
+
+-------------------------------------------------------------------
+Mon Feb 20 13:33:45 UTC 2012 - fcrozat@suse.com
+
+- Update to version 43:
+  + requires /etc/os-release, support for /etc/SuSE-release is no
+    longer present.
+  + Track class of PAM logins to distinguish greeters from normal
+    user logins.
+  + Various bug fixes.
+
 -------------------------------------------------------------------
 Sun Feb 19 07:56:05 UTC 2012 - jengelh@medozas.de
 

systemd.spec

@@ -15,11 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 #don't require python, use recommends (bnc#716939)
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        42
+Version:        43
 Release:        0
 Summary:        A System and Session Manager
 License:        GPL-2.0+
@@ -46,12 +47,12 @@ BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libselinux)
 BuildRequires:  pkgconfig(libsepol)
 BuildRequires:  pkgconfig(udev) >= 172
-Requires:       udev >= 172
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
-Requires:       util-linux >= 2.19
 Requires:       pam-config >= 0.79-5
 Requires:       systemd-presets-branding
+Requires:       udev >= 172
+Requires:       util-linux >= 2.19
 Recommends:     dbus-1-python
 Conflicts:      filesystem < 11.5
 Conflicts:      mkinitrd < 2.7.0
@@ -62,8 +63,6 @@ Source3:        systemd-sysv-convert
 Source4:        macros.systemd
 Source5:        systemd-insserv_conf
 Source6:        baselibs.conf
-# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
-Source11:       listen.conf
 Patch1:         0001-Add-bootsplash-handling-for-password-dialogs.patch
 # handle SUSE specific kbd settings
 Patch6:         0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch
@@ -81,6 +80,7 @@ Patch31:        lock-opensuse.patch
 Patch33:        crypt-loop-file.patch
 Patch36:        sysctl-modules.patch
 Patch38:        dm-lvm-after-local-fs-pre-target.patch
+Patch39:        correct_plymouth_paths_and_conflicts.patch
 
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
@@ -145,6 +145,7 @@ Plymouth integration for systemd
 %patch33 -p1
 %patch36 -p1
 %patch38 -p1
+%patch39 -p1
 
 %build
 autoreconf -fiv
@@ -187,8 +188,6 @@ ln -s ../bin/systemctl %{buildroot}/sbin/telinit
 ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
 rm -rf %{buildroot}/etc/systemd/system/*.target.wants
 rm -f %{buildroot}/etc/systemd/system/default.target
-# Don't activate the plymouth-quit services in order to get a smooth transistion to the DM
-rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-quit*.service
 # aliases for /etc/init.d/*
 ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service
 ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service
@@ -222,10 +221,6 @@ rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/coredump.conf
 # Let rsyslog read from /proc/kmsg for now
 sed -i -e 's/\#ImportKernel=yes/ImportKernel=no/' %{buildroot}%{_sysconfdir}/systemd/systemd-journald.conf
 
-# Install rsyslog fragment
-mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
-install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/rsyslog.d/
-
 # Create the /var/log/journal directory to change the volatile journal to a persistent one
 mkdir -p %{buildroot}/var/log/journal
 
@@ -317,7 +312,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/binfmt.d
 %dir /usr/lib/sysctl.d
 %dir %{_sysconfdir}/sysctl.d
-%dir %{_sysconfdir}/rsyslog.d
 /usr/lib/tmpfiles.d/*.conf
 %config(noreplace) %{_sysconfdir}/systemd/system.conf
 %config(noreplace) %{_sysconfdir}/systemd/systemd-logind.conf
@@ -329,7 +323,6 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
-%config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml