Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at Sun Oct 2 11:16:12 CEST 2011.
-------- --- openSUSE:Factory/systemd/systemd-gtk.changes 2011-09-27 16:06:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/systemd/systemd-gtk.changes 2011-09-29 18:10:15.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 29 16:08:33 UTC 2011 - fcro...@suse.com + +- Add services to stop bootsplash at end of startup and start it at + beginning of shutdown. +- Fix bootsplash call and ensure dependencies are set right. + +------------------------------------------------------------------- +Thu Sep 29 13:43:00 UTC 2011 - fcro...@suse.com + +- Add detect-non-running.patch: fix assertion when running + systemctl under non systemd system (git). +- Requires presets branding package. +- Improve macros a little bit. + +------------------------------------------------------------------- systemd.changes: same change calling whatdependson for head-i586 New: ---- bootsplash-quit.service bootsplash-shutdown.service detect-non-running.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.pFYfX4/_old 2011-10-02 11:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pFYfX4/_new 2011-10-02 11:16:04.000000000 +0200 @@ -44,6 +44,7 @@ Requires: kbd Requires: util-linux >= 2.19 Requires: pam-config +Requires: systemd-presets-branding Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 @@ -55,6 +56,8 @@ Source6: baselibs.conf Source7: systemd-bootsplash Source8: bootsplash-startup.service +Source9: bootsplash-quit.service +Source10: bootsplash-shutdown.service 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 @@ -69,6 +72,7 @@ Patch9: 0001-execute-fix-bus-serialization-for-commands.patch # PATCH-FIX-UPSTREAM fix-reload.patch fcro...@suse.com bnc#719221 -- Fix daemon-reload and conditions when service is starting Patch11: fix-reload.patch +Patch12: detect-non-running.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -124,6 +128,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build autoreconf -fiv @@ -148,7 +153,11 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators install -m755 %{S:7} %{buildroot}/lib/systemd/ -install -m644 %{S:8} %{buildroot}/lib/systemd/system/ +install -m644 %{S:8} %{S:9} %{S:10} %{buildroot}/lib/systemd/system/ +ln -s ../bootsplash-startup.service %{buildroot}/lib/systemd/system/basic.target.wants/ +ln -s ../bootsplash-quit.service %{buildroot}/lib/systemd/system/multi-user.target.wants/ +ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/shutdown.target.wants/ +ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/reboot.target.wants/ ln -s ../bin/systemd %{buildroot}/sbin/init ln -s ../bin/systemctl %{buildroot}/sbin/reboot ln -s ../bin/systemctl %{buildroot}/sbin/halt ++++++ bootsplash-quit.service ++++++ [Unit] Description=Terminate bootsplash After=xdm.service rc-local.service bootsplash-startup.service DefaultDependencies=no Names=plymout-quit-wait.service [Service] ExecStart=/lib/systemd/systemd-bootsplash 5 Type=oneshot RemainAfterExit=true ++++++ bootsplash-shutdown.service ++++++ [Unit] Description=Start bootsplash for shutdown/reboot Before=shutdown.service halt.service DefaultDependencies=no ConditionKernelCommandLine=splash=silent [Service] ExecStart=/lib/systemd/systemd-bootsplash 0 Type=oneshot RemainAfterExit=true ++++++ bootsplash-startup.service ++++++ --- /var/tmp/diff_new_pack.pFYfX4/_old 2011-10-02 11:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pFYfX4/_new 2011-10-02 11:16:04.000000000 +0200 @@ -4,6 +4,6 @@ ConditionKernelCommandLine=splash=silent [Service] -ExecStart=/lib/system/systemd-bootsplash B +ExecStart=/lib/systemd/systemd-bootsplash 0 Type=oneshot RemainAfterExit=true ++++++ detect-non-running.patch ++++++ >From 8185a5090a34531b9ef0a65ed3e948e7b6839754 Mon Sep 17 00:00:00 2001 From: Lennart Poettering <lenn...@poettering.net> Date: Thu, 29 Sep 2011 15:31:53 +0200 Subject: [PATCH] systemctl: fix detection whether the dbus connection is available --- src/systemctl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/systemctl.c b/src/systemctl.c index 848d6a8..7af0f73 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -4989,6 +4989,13 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError return 0; } + if (!bus) { + log_error("Failed to get D-Bus connection: %s", error->message); + return -EIO; + } + + } else { + if (!bus && !avoid_bus()) { log_error("Failed to get D-Bus connection: %s", error->message); return -EIO; -- 1.7.3.4 ++++++ macros.systemd ++++++ --- /var/tmp/diff_new_pack.pFYfX4/_old 2011-10-02 11:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pFYfX4/_new 2011-10-02 11:16:04.000000000 +0200 @@ -34,12 +34,12 @@ # disable migration if initial install under systemd \ if [ $FIRST_ARG -eq 1 ]; then \ for service in %{?*} ; do \ - sysv_service=`echo $service | sed -e 's/\\.[a-z]*//g'` \ + sysv_service=${service%.*} \ touch "/var/lib/systemd/migrated/$sysv_service" \ done \ else \ for service in %{?*} ; do \ - sysv_service=`echo $service | sed -e 's/\\.[a-z]*//g'` \ + sysv_service=${service%.*} \ if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then \ services_to_migrate="$services_to_migrate $sysv_service" \ fi \ @@ -54,7 +54,7 @@ %service_add_post() \ test -n "$FIRST_ARG" || FIRST_ARG=$1 \ for service in %{?*} ; do \ - sysv_service=`echo $service | sed -e 's/\\.[a-z]*//g'` \ + sysv_service=${service%.*} \ if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then \ services_to_migrate="$services_to_migrate $sysv_service" \ touch "/var/lib/systemd/migrated/$sysv_service" \ @@ -85,7 +85,7 @@ /bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \ else # package uninstall \ for service in %{?*} ; do \ - sysv_service=`echo $service | sed -e 's/\\.[a-z]*//g'` \ + sysv_service=${service%.*} \ rm -f "/var/lib/systemd/migrated/$sysv_service" 2> /dev/null \ done \ /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ ++++++ systemd-bootsplash ++++++ --- /var/tmp/diff_new_pack.pFYfX4/_old 2011-10-02 11:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pFYfX4/_new 2011-10-02 11:16:04.000000000 +0200 @@ -1,3 +1,10 @@ #! /bin/bash . /etc/rc.splash $1 -splashtrigger "rlchange $1" +export RUNLEVEL=$1 +export PREVLEVEL=N +if [ "$1" == "5" ]; then + splashtrigger "rlreached $1" +else + splashtrigger "rlchange $1" + splashtrigger "coolo" +fi continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
