From 19385119e94d1fddb00612075b3743cfab1d70379041fe23051815aac5a6670c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 6 Sep 2010 19:51:53 +0000
Subject: [PATCH] version 9

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=58
---
 systemd-7.tar.bz2 |  3 ---
 systemd-9.tar.bz2 |  3 +++
 systemd.changes   | 29 +++++++++++++++++++++++++++++
 systemd.spec      | 18 +++++-------------
 4 files changed, 37 insertions(+), 16 deletions(-)
 delete mode 100644 systemd-7.tar.bz2
 create mode 100644 systemd-9.tar.bz2

diff --git a/systemd-7.tar.bz2 b/systemd-7.tar.bz2
deleted file mode 100644
index c2fa46bb..00000000
--- a/systemd-7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23013686f88c91b3c1298d6d20630c4b063030b922cbb74098e20e123823c820
-size 652241
diff --git a/systemd-9.tar.bz2 b/systemd-9.tar.bz2
new file mode 100644
index 00000000..dc66f76c
--- /dev/null
+++ b/systemd-9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31323d052daff12e86b9971b2ecd20c12f4ac41ed04ee11a1eb2686a2c9bb313
+size 666685
diff --git a/systemd.changes b/systemd.changes
index 04641998..8af63d2d 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com
+
+- version 9
+  - units: don't add shutdown conflicts dep to umount.target
+  - dbus: don't send cgroup agent messages directly to system bus
+  - dbus: don't accept activation requests anymore if we are going
+    down anyway
+  - systemctl: fix return value of systemctl start and friends
+  - service: wait for process exit only if we actually killed
+    somebody
+
+-------------------------------------------------------------------
+Thu Aug 26 22:14:04 CEST 2010 - kay.sievers@novell.com
+
+- version 8
+  - KERNEL 2.6.36+ REQUIRED!
+  - mount cgroup file systems to /sys/fs/cgroup instead of /cgroup
+  - invoke sulogin instead of /bin/sh
+  - systemctl: show timestamps for state changes
+  - add global configuration options for handling of auto mounts
+
+-------------------------------------------------------------------
+Fri Aug 20 06:51:26 CEST 2010 - kay.sievers@novell.com
+
+- apply /etc/fstab mount options to all api mounts
+- properly handle LABEL="" in fstab
+- do not consider LSB exit codes 5 and 6 as failure
+
 -------------------------------------------------------------------
 Tue Aug 17 22:54:41 CEST 2010 - kay.sievers@novell.com
 
diff --git a/systemd.spec b/systemd.spec
index 9a857bea..1b7aa96e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,7 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        7
+Version:        9
 Release:        1
 License:        GPLv2+
 Group:          System/Base
@@ -34,8 +34,8 @@ BuildRequires:  pam-devel
 BuildRequires:  pkg-config
 BuildRequires:  dbus-1-glib-devel gtk2-devel
 BuildRequires:  libselinux-devel libsepol-devel
-Requires:       udev >= 160
-Requires:       dbus-1 >= 1.3.2
+Requires:       udev >= 162
+Requires:       dbus-1 >= 1.4.0
 Conflicts:      mkinitrd < 2.6.0-5
 Source0:        http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2
 Source1:        systemd-rpmlintrc
@@ -104,11 +104,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/modules.d
 ln -s hwclock-load.service $RPM_BUILD_ROOT/lib/systemd/system/clock.service
 ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service
 
-%pre
-# kernel changes are pending to move this to /sys/fs/cgroup
-mkdir -p -m 0755 /cgroup || :
-
 %post
+/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
+
 # Create default config in /etc at first install.
 # Later package updates should not overwrite these settings.
 if [ "$1" -eq 1 ]; then
@@ -133,12 +131,6 @@ if [ "$1" -eq 1 ]; then
     var-run.service \
     var-lock.service >/dev/null 2>&1 || :
 fi
-# Make sure we always enable these basic services, in case something went
-# wrong at the time these packages got installed. Usual systems can not
-# properly work without these services.
-/bin/systemctl enable \
-  udev.service \
-  dbus.service >/dev/null 2>&1 || :
 
 %preun
 if [ $1 -eq 0 ]; then