From 87d0d4f3931ff7b5abb086db2d741f74b756a8ad Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 8 Aug 2012 23:53:11 +0200
Subject: [PATCH 01/16] drop obsolete --disable-plymouth configure argument

---
 systemd.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/systemd.spec b/systemd.spec
index 6c11869..edfba5b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -163,7 +163,6 @@ glib-based applications using libudev functionality.
 %{?gitcommit: ./autogen.sh }
 %configure \
         --with-distro=fedora \
-        --disable-plymouth \
         --libexecdir=%{_prefix}/lib \
         --enable-gtk-doc \
         --disable-static

From c7ab700aabca3378d1248e68aba51a4570031cf7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 12 Aug 2012 01:39:24 +0200
Subject: [PATCH 02/16] switch-root: remount MS_PRIVATE

---
 systemd.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/systemd.spec b/systemd.spec
index edfba5b..91ea03f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -5,7 +5,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        188
-Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -59,6 +59,8 @@ Source2:        systemd-sysv-convert
 Source3:        udlfb.conf
 # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
 Source4:        listen.conf
+Patch0:         0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+Patch1:         0001-switch-root-remount-to-MS_PRIVATE.patch
 
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -158,6 +160,8 @@ glib-based applications using libudev functionality.
 
 %prep
 %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{?gitcommit: ./autogen.sh }
@@ -529,6 +533,10 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Sat Aug 11 2012 Lennart Poettering <lpoetter@redhat.com> - 188-3
+- Remount file systems MS_PRIVATE before switching roots
+- https://bugzilla.redhat.com/show_bug.cgi?id=847418
+
 * Wed Aug 08 2012 Rex Dieter <rdieter@fedoraproject.org> - 188-2
 - fix scriptlets
 

From bff934959d5fd3ac41f55b39841eafc38dff0bb0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 12 Aug 2012 01:59:12 +0200
Subject: [PATCH 03/16] add missing patches

---
 ...vely-mark-root-as-private-before-piv.patch | 31 +++++++++
 0001-switch-root-remount-to-MS_PRIVATE.patch  | 68 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 0001-shutdown-recursively-mark-root-as-private-before-piv.patch
 create mode 100644 0001-switch-root-remount-to-MS_PRIVATE.patch

diff --git a/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
new file mode 100644
index 0000000..702004f
--- /dev/null
+++ b/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
@@ -0,0 +1,31 @@
+From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 10 Aug 2012 11:02:03 -0400
+Subject: [PATCH] shutdown: recursively mark root as private before pivot
+
+Because root is now recursively marked as shared on bootup, we need to
+recursively mark root as private. This prevents a pivot_root failure on
+shutdown:
+
+  Cannot finalize remaining file systems and devices, giving up.
+  pivot failed: Invalid argument
+---
+ src/core/shutdown.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/shutdown.c b/src/core/shutdown.c
+index 105a604..0b7cbd8 100644
+--- a/src/core/shutdown.c
++++ b/src/core/shutdown.c
+@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
+           It works for pivot_root, but the ref count for the root device
+           is not decreasing :-/
+         */
+-        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
++        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
+                 log_error("Failed to make \"/\" private mount %m");
+                 return -errno;
+         }
+-- 
+1.7.11.2
+
diff --git a/0001-switch-root-remount-to-MS_PRIVATE.patch b/0001-switch-root-remount-to-MS_PRIVATE.patch
new file mode 100644
index 0000000..cc48f2a
--- /dev/null
+++ b/0001-switch-root-remount-to-MS_PRIVATE.patch
@@ -0,0 +1,68 @@
+From f47fc35555565c4b161c2e44b357b4dbaf3a997d Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sun, 12 Aug 2012 01:29:41 +0200
+Subject: [PATCH] switch-root: remount to MS_PRIVATE
+
+The kernel does not allow switching roots if things are mounted
+MS_SHARED. As a work-around, remount things MS_PRIVATE before switching
+roots.
+
+This should be fixed in the kernel for good.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=847418
+---
+ src/core/shutdown.c    | 17 ++++++++---------
+ src/core/switch-root.c |  9 +++++++++
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/shutdown.c b/src/core/shutdown.c
+index 0b7cbd8..c3a4c39 100644
+--- a/src/core/shutdown.c
++++ b/src/core/shutdown.c
+@@ -104,15 +104,14 @@ static int pivot_to_new_root(void) {
+                 return -errno;
+         }
+ 
+-        /*
+-          In case some evil process made "/" MS_SHARED
+-          It works for pivot_root, but the ref count for the root device
+-          is not decreasing :-/
+-        */
+-        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
+-                log_error("Failed to make \"/\" private mount %m");
+-                return -errno;
+-        }
++        /* Work-around for a kernel bug: for some reason the kernel
++         * refuses switching root if any file systems are mounted
++         * MS_SHARED. Hence remount them MS_PRIVATE here as a
++         * work-around.
++         *
++         * https://bugzilla.redhat.com/show_bug.cgi?id=847418 */
++        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0)
++                log_warning("Failed to make \"/\" private mount: %m");
+ 
+         if (pivot_root(".", "oldroot") < 0) {
+                 log_error("pivot failed: %m");
+diff --git a/src/core/switch-root.c b/src/core/switch-root.c
+index 9832a52..efc7d34 100644
+--- a/src/core/switch-root.c
++++ b/src/core/switch-root.c
+@@ -56,6 +56,15 @@ int switch_root(const char *new_root) {
+                 goto fail;
+         }
+ 
++        /* Work-around for a kernel bug: for some reason the kernel
++         * refuses switching root if any file systems are mounted
++         * MS_SHARED. Hence remount them MS_PRIVATE here as a
++         * work-around.
++         *
++         * https://bugzilla.redhat.com/show_bug.cgi?id=847418 */
++        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0)
++                log_warning("Failed to make \"/\" private mount: %m");
++
+         NULSTR_FOREACH(i, move_mounts) {
+                 char new_mount[PATH_MAX];
+                 struct stat sb;
+-- 
+1.7.11.2
+

From 38a7fb71ae32589a94158c3158f6d0e7793e10d3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Aug 2012 03:27:58 +0200
Subject: [PATCH 04/16] New upstream release

---
 ...vely-mark-root-as-private-before-piv.patch | 31 ---------
 0001-switch-root-remount-to-MS_PRIVATE.patch  | 68 -------------------
 sources                                       |  2 +-
 systemd.spec                                  | 27 ++++----
 4 files changed, 15 insertions(+), 113 deletions(-)
 delete mode 100644 0001-shutdown-recursively-mark-root-as-private-before-piv.patch
 delete mode 100644 0001-switch-root-remount-to-MS_PRIVATE.patch

diff --git a/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
deleted file mode 100644
index 702004f..0000000
--- a/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 10 Aug 2012 11:02:03 -0400
-Subject: [PATCH] shutdown: recursively mark root as private before pivot
-
-Because root is now recursively marked as shared on bootup, we need to
-recursively mark root as private. This prevents a pivot_root failure on
-shutdown:
-
-  Cannot finalize remaining file systems and devices, giving up.
-  pivot failed: Invalid argument
----
- src/core/shutdown.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 105a604..0b7cbd8 100644
---- a/src/core/shutdown.c
-+++ b/src/core/shutdown.c
-@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
-           It works for pivot_root, but the ref count for the root device
-           is not decreasing :-/
-         */
--        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
-                 log_error("Failed to make \"/\" private mount %m");
-                 return -errno;
-         }
--- 
-1.7.11.2
-
diff --git a/0001-switch-root-remount-to-MS_PRIVATE.patch b/0001-switch-root-remount-to-MS_PRIVATE.patch
deleted file mode 100644
index cc48f2a..0000000
--- a/0001-switch-root-remount-to-MS_PRIVATE.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f47fc35555565c4b161c2e44b357b4dbaf3a997d Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 12 Aug 2012 01:29:41 +0200
-Subject: [PATCH] switch-root: remount to MS_PRIVATE
-
-The kernel does not allow switching roots if things are mounted
-MS_SHARED. As a work-around, remount things MS_PRIVATE before switching
-roots.
-
-This should be fixed in the kernel for good.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=847418
----
- src/core/shutdown.c    | 17 ++++++++---------
- src/core/switch-root.c |  9 +++++++++
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 0b7cbd8..c3a4c39 100644
---- a/src/core/shutdown.c
-+++ b/src/core/shutdown.c
-@@ -104,15 +104,14 @@ static int pivot_to_new_root(void) {
-                 return -errno;
-         }
- 
--        /*
--          In case some evil process made "/" MS_SHARED
--          It works for pivot_root, but the ref count for the root device
--          is not decreasing :-/
--        */
--        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
--                log_error("Failed to make \"/\" private mount %m");
--                return -errno;
--        }
-+        /* Work-around for a kernel bug: for some reason the kernel
-+         * refuses switching root if any file systems are mounted
-+         * MS_SHARED. Hence remount them MS_PRIVATE here as a
-+         * work-around.
-+         *
-+         * https://bugzilla.redhat.com/show_bug.cgi?id=847418 */
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0)
-+                log_warning("Failed to make \"/\" private mount: %m");
- 
-         if (pivot_root(".", "oldroot") < 0) {
-                 log_error("pivot failed: %m");
-diff --git a/src/core/switch-root.c b/src/core/switch-root.c
-index 9832a52..efc7d34 100644
---- a/src/core/switch-root.c
-+++ b/src/core/switch-root.c
-@@ -56,6 +56,15 @@ int switch_root(const char *new_root) {
-                 goto fail;
-         }
- 
-+        /* Work-around for a kernel bug: for some reason the kernel
-+         * refuses switching root if any file systems are mounted
-+         * MS_SHARED. Hence remount them MS_PRIVATE here as a
-+         * work-around.
-+         *
-+         * https://bugzilla.redhat.com/show_bug.cgi?id=847418 */
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0)
-+                log_warning("Failed to make \"/\" private mount: %m");
-+
-         NULSTR_FOREACH(i, move_mounts) {
-                 char new_mount[PATH_MAX];
-                 struct stat sb;
--- 
-1.7.11.2
-
diff --git a/sources b/sources
index ddd0fdf..b91e82c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d89b42699695554949d072ef46c0dfc9  systemd-188.tar.xz
+ac2eb313f5dce79622f60aac56bca66d  systemd-189.tar.xz
diff --git a/systemd.spec b/systemd.spec
index 91ea03f..c1de7e3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -4,8 +4,8 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        188
-Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
+Version:        189
+Release:        1%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -16,20 +16,22 @@ BuildRequires:  libselinux-devel
 BuildRequires:  audit-libs-devel
 BuildRequires:  cryptsetup-luks-devel
 BuildRequires:  dbus-devel
-BuildRequires:  libxslt
-BuildRequires:  docbook-style-xsl
-BuildRequires:  pkgconfig
 BuildRequires:  libacl-devel
 BuildRequires:  pciutils-devel
 BuildRequires:  glib2-devel
-BuildRequires:  hwdata
 BuildRequires:  gobject-introspection-devel >= 0.6.2
-BuildRequires:  usbutils >= 0.82
 BuildRequires:  libblkid-devel >= 2.20
-BuildRequires:  intltool >= 0.40.0
-BuildRequires:  gperf
 BuildRequires:  xz-devel
 BuildRequires:  kmod-devel >= 5
+BuildRequires:  libgcrypt-devel
+BuildRequires:  qrencode-devel
+BuildRequires:  hwdata
+BuildRequires:  libxslt
+BuildRequires:  docbook-style-xsl
+BuildRequires:  pkgconfig
+BuildRequires:  usbutils >= 0.82
+BuildRequires:  intltool >= 0.40.0
+BuildRequires:  gperf
 BuildRequires:  gtk-doc
 %if %{defined gitcommit}
 BuildRequires:  automake
@@ -59,8 +61,6 @@ Source2:        systemd-sysv-convert
 Source3:        udlfb.conf
 # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
 Source4:        listen.conf
-Patch0:         0001-shutdown-recursively-mark-root-as-private-before-piv.patch
-Patch1:         0001-switch-root-remount-to-MS_PRIVATE.patch
 
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -160,8 +160,6 @@ glib-based applications using libudev functionality.
 
 %prep
 %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{?gitcommit: ./autogen.sh }
@@ -533,6 +531,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-1:.git%{gitcommit}}%{?dist}
+- New upstream release
+
 * Sat Aug 11 2012 Lennart Poettering <lpoetter@redhat.com> - 188-3
 - Remount file systems MS_PRIVATE before switching roots
 - https://bugzilla.redhat.com/show_bug.cgi?id=847418

From b1c19b8f8b68109b382f20ddf985c4b72c0544a9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Aug 2012 04:15:54 +0200
Subject: [PATCH 05/16] update preset policy

---
 99-default.preset | 3 +++
 systemd.spec      | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/99-default.preset b/99-default.preset
index 160cfdf..ebb205d 100644
--- a/99-default.preset
+++ b/99-default.preset
@@ -7,5 +7,8 @@ enable avahi-daemon.*
 # Enable GDM by default
 enable gdm.service
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=850814
+arp-ethers.service
+
 # Enforce Fedora's disable-by-default policy
 disable *
diff --git a/systemd.spec b/systemd.spec
index c1de7e3..2febf5b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -5,7 +5,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        189
-Release:        1%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -531,7 +531,11 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
-* Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-1:.git%{gitcommit}}%{?dist}
+* Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-2
+- Update preset policy
+- https://bugzilla.redhat.com/show_bug.cgi?id=850814
+
+* Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-1
 - New upstream release
 
 * Sat Aug 11 2012 Lennart Poettering <lpoetter@redhat.com> - 188-3

From 53dceb0ecf9b3a7e71878870fdd570f2a2bb2db0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Sep 2012 14:27:28 -0700
Subject: [PATCH 06/16] git: explain that people should not blindly rebuild
 things on rawhide if they update a non-rawhide devel distro

---
 systemd.spec | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/systemd.spec b/systemd.spec
index 2febf5b..5f4acf3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -4,6 +4,18 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
+
+# Hey, you! So you are preparing an update for a Fedora version that
+# is not yet released, but is already forked off Rawhide? If so,
+# please think twice before commiting this also into Rawhide. In
+# almost all cases we simply let Koji do the work for us and let the
+# build system inherit the currently developed version into Rawhide,
+# and do not do this via explicit git cherry picks. Thank you very
+# much.
+
+# AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE
+# THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
+
 Version:        189
 Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README

From 558d65991bc7525501e63f9aff4a5bb65ef09183 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 12 Sep 2012 05:22:14 +0200
Subject: [PATCH 07/16] update preset file

---
 99-default.preset | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/99-default.preset b/99-default.preset
index ebb205d..d03d631 100644
--- a/99-default.preset
+++ b/99-default.preset
@@ -1,14 +1,29 @@
 # Also see:
 # https://fedoraproject.org/wiki/Starting_services_by_default
 
-# Enable Avahi by default
+# System stuff
+enable sshd.service
+enable atd.service
+enable crond.service
+enable rpcbind.*
+enable rsyslog.*
+enable NetworkManager.service
 enable avahi-daemon.*
 
-# Enable GDM by default
+# Desktop stuff
+enable accounts-daemon.service
+enable rtkit-daemon.service
+enable upower.service
 enable gdm.service
+enable udisks2.service
+enable polkit.service
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=850814
-arp-ethers.service
+enable arp-ethers.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=855372
+enable mdmonitor.service
+enable mdmonitor-takeover.service
 
 # Enforce Fedora's disable-by-default policy
 disable *

From 301de5d4da1231689f97aaaa714f76f5834492bf Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 01:04:00 +0200
Subject: [PATCH 08/16] update preset list

---
 90-default.preset | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 99-default.preset | 29 ------------------
 systemd.spec      | 10 ++++--
 3 files changed, 85 insertions(+), 32 deletions(-)
 create mode 100644 90-default.preset
 delete mode 100644 99-default.preset

diff --git a/90-default.preset b/90-default.preset
new file mode 100644
index 0000000..e2f5378
--- /dev/null
+++ b/90-default.preset
@@ -0,0 +1,78 @@
+# Also see:
+# https://fedoraproject.org/wiki/Starting_services_by_default
+
+# System stuff
+enable sshd.service
+enable atd.service
+enable crond.service
+enable chronyd.service
+enable rpcbind.*
+enable NetworkManager.service
+enable auditd.service
+enable restorecond.service
+enable bluetooth.service
+enable avahi-daemon.*
+enable cups.*
+
+# The various syslog implementations
+enable rsyslog.*
+enable syslog-ng.*
+enable sysklogd.*
+
+# Other stuff
+enable abrtd.service
+enable abrt-ccpp.service
+enable abrt-oops.service
+enable abrt-xorg.service
+enable abrt-vmcore.service
+enable acpid.service
+enable firewalld.service
+enable multipathd.service
+enable firstboot-graphical.service
+enable gpm.service
+enable gpsd.service
+enable iptables.service
+enable ip6tables.service
+enable irqbalance.service
+enable isdn.service
+enable ladvd.service
+enable libstoragemgmt.service
+enable libvirtd.service
+enable lm_sensors.service
+enable lttng-sessiond.service
+enable lvm2-monitor.*
+enable lvm2-lvmetad.*
+enable dm-event.*
+enable mcelog.service
+enable packagekit-offline-update.service
+enable pcscd.*
+enable ksm.service
+enable ksmtuned.service
+enable rootfs-resize.service
+enable smartd.service
+enable sysstat.service
+enable uuidd.service
+enable xendomains.service
+enable xendomains.service
+enable xenstored.service
+enable xenconsoled.service
+enable xinetd.service
+enable dirsrv-admin.service
+
+# Desktop stuff
+enable accounts-daemon.service
+enable rtkit-daemon.service
+enable upower.service
+enable gdm.service
+enable udisks2.service
+enable polkit.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=850814
+enable arp-ethers.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=855372
+enable mdmonitor.service
+enable mdmonitor-takeover.service
+
+# Enforce Fedora's disable-by-default policy
+disable *
diff --git a/99-default.preset b/99-default.preset
deleted file mode 100644
index d03d631..0000000
--- a/99-default.preset
+++ /dev/null
@@ -1,29 +0,0 @@
-# Also see:
-# https://fedoraproject.org/wiki/Starting_services_by_default
-
-# System stuff
-enable sshd.service
-enable atd.service
-enable crond.service
-enable rpcbind.*
-enable rsyslog.*
-enable NetworkManager.service
-enable avahi-daemon.*
-
-# Desktop stuff
-enable accounts-daemon.service
-enable rtkit-daemon.service
-enable upower.service
-enable gdm.service
-enable udisks2.service
-enable polkit.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=850814
-enable arp-ethers.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=855372
-enable mdmonitor.service
-enable mdmonitor-takeover.service
-
-# Enforce Fedora's disable-by-default policy
-disable *
diff --git a/systemd.spec b/systemd.spec
index 5f4acf3..1bb9528 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -17,7 +17,7 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
 # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
 
 Version:        189
-Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -66,7 +66,7 @@ Source0:        %{name}-git%{gitcommit}.tar.xz
 Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 %endif
 # Fedora's default preset policy
-Source1:        99-default.preset
+Source1:        90-default.preset
 # Feodora's SysV convert script. meh.
 Source2:        systemd-sysv-convert
 # Stop-gap, just to ensure things work out-of-the-box for this driver.
@@ -453,7 +453,7 @@ fi
 %{_prefix}/lib/tmpfiles.d/x11.conf
 %{_prefix}/lib/tmpfiles.d/legacy.conf
 %{_prefix}/lib/tmpfiles.d/tmp.conf
-%{_prefix}/lib/systemd/system-preset/99-default.preset
+%{_prefix}/lib/systemd/system-preset/90-default.preset
 %{_sbindir}/init
 %{_sbindir}/reboot
 %{_sbindir}/halt
@@ -543,6 +543,10 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Sep 12 2012 Lennart Poettering <lpoetter@redhat.com> - 189-3
+- Update preset policy
+- Rename preset policy file from 99-default.preset to 90-default.preset so that people can order their own stuff after the Fedora default policy if they wish
+
 * Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-2
 - Update preset policy
 - https://bugzilla.redhat.com/show_bug.cgi?id=850814

From f2b77236841021a01f54c072c52808637e12881b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 01:57:40 +0200
Subject: [PATCH 09/16] reorder preset list a bit

---
 90-default.preset | 68 ++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/90-default.preset b/90-default.preset
index e2f5378..cc0bdfa 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -19,45 +19,57 @@ enable rsyslog.*
 enable syslog-ng.*
 enable sysklogd.*
 
+# Network facing
+enable firewalld.service
+enable iptables.service
+enable ip6tables.service
+enable isdn.service
+enable libvirtd.service
+enable xinetd.service
+enable ladvd.service
+
+# Probably something to statically enable
+enable firstboot-graphical.service
+
+# Storage
+enable multipathd.service
+enable libstoragemgmt.service
+enable lvm2-monitor.*
+enable lvm2-lvmetad.*
+enable dm-event.*
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=855372
+enable mdmonitor.service
+enable mdmonitor-takeover.service
+
+# Hardware
+enable gpm.service
+enable gpsd.service
+enable irqbalance.service
+enable lm_sensors.service
+enable mcelog.service
+enable acpid.service
+enable smartd.service
+enable pcscd.*
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=850814
+enable arp-ethers.service
+
 # Other stuff
 enable abrtd.service
 enable abrt-ccpp.service
 enable abrt-oops.service
 enable abrt-xorg.service
 enable abrt-vmcore.service
-enable acpid.service
-enable firewalld.service
-enable multipathd.service
-enable firstboot-graphical.service
-enable gpm.service
-enable gpsd.service
-enable iptables.service
-enable ip6tables.service
-enable irqbalance.service
-enable isdn.service
-enable ladvd.service
-enable libstoragemgmt.service
-enable libvirtd.service
-enable lm_sensors.service
 enable lttng-sessiond.service
-enable lvm2-monitor.*
-enable lvm2-lvmetad.*
-enable dm-event.*
-enable mcelog.service
-enable packagekit-offline-update.service
-enable pcscd.*
 enable ksm.service
 enable ksmtuned.service
 enable rootfs-resize.service
-enable smartd.service
 enable sysstat.service
 enable uuidd.service
 enable xendomains.service
-enable xendomains.service
 enable xenstored.service
 enable xenconsoled.service
-enable xinetd.service
-enable dirsrv-admin.service
 
 # Desktop stuff
 enable accounts-daemon.service
@@ -66,13 +78,7 @@ enable upower.service
 enable gdm.service
 enable udisks2.service
 enable polkit.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=850814
-enable arp-ethers.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=855372
-enable mdmonitor.service
-enable mdmonitor-takeover.service
+enable packagekit-offline-update.service
 
 # Enforce Fedora's disable-by-default policy
 disable *

From 2eb02020e2f2ff9eb4ceafd286d067f0cacb30db Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 11:42:51 +0200
Subject: [PATCH 10/16] preset: move arp-ethers to the rest of the network
 services

---
 90-default.preset | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/90-default.preset b/90-default.preset
index cc0bdfa..7f6024d 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -3,14 +3,14 @@
 
 # System stuff
 enable sshd.service
-enable atd.service
-enable crond.service
+enable atd.*
+enable crond.*
 enable chronyd.service
 enable rpcbind.*
 enable NetworkManager.service
 enable auditd.service
 enable restorecond.service
-enable bluetooth.service
+enable bluetooth.*
 enable avahi-daemon.*
 enable cups.*
 
@@ -28,6 +28,9 @@ enable libvirtd.service
 enable xinetd.service
 enable ladvd.service
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=850814
+enable arp-ethers.service
+
 # Probably something to statically enable
 enable firstboot-graphical.service
 
@@ -43,18 +46,15 @@ enable mdmonitor.service
 enable mdmonitor-takeover.service
 
 # Hardware
-enable gpm.service
-enable gpsd.service
+enable gpm.*
+enable gpsd.*
 enable irqbalance.service
 enable lm_sensors.service
-enable mcelog.service
-enable acpid.service
+enable mcelog.*
+enable acpid.*
 enable smartd.service
 enable pcscd.*
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=850814
-enable arp-ethers.service
-
 # Other stuff
 enable abrtd.service
 enable abrt-ccpp.service

From 391f9f8b9d2c7f3633cf790267f4443930c4f7bc Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 14:43:03 +0200
Subject: [PATCH 11/16] Don't pull in pkg-config as dep

---
 systemd.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/systemd.spec b/systemd.spec
index 1bb9528..9c2d729 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -2,6 +2,11 @@
 
 %global _hardened_build 1
 
+# We ship a .pc file but don't want to have a dep on pkg-config. We
+# strip the automatically generated dep here and instead co-own the
+# directory.
+%global __requires_exclude pkg-config
+
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 
@@ -17,7 +22,7 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
 # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
 
 Version:        189
-Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -398,6 +403,7 @@ fi
 %dir %{_prefix}/lib/firmware
 %dir %{_prefix}/lib/firmware/updates
 %dir %{_datadir}/systemd
+%dir %{_datadir}/pkgconfig
 %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.login1.conf
@@ -543,6 +549,10 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Sep 13 2012 Lennart Poettering <lpoetter@redhat.com> - 189-4
+- Don't pull in pkg-config as dep
+- https://bugzilla.redhat.com/show_bug.cgi?id=852828
+
 * Wed Sep 12 2012 Lennart Poettering <lpoetter@redhat.com> - 189-3
 - Update preset policy
 - Rename preset policy file from 99-default.preset to 90-default.preset so that people can order their own stuff after the Fedora default policy if they wish

From 8c99ae318590fef2639e7a96c69342de8312cfd7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 20:35:28 +0200
Subject: [PATCH 12/16] preset: drop arp-ethers again

---
 90-default.preset | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/90-default.preset b/90-default.preset
index 7f6024d..fd7c229 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -28,12 +28,6 @@ enable libvirtd.service
 enable xinetd.service
 enable ladvd.service
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=850814
-enable arp-ethers.service
-
-# Probably something to statically enable
-enable firstboot-graphical.service
-
 # Storage
 enable multipathd.service
 enable libstoragemgmt.service

From c070a16bdbb20f6d869efe4457675542147b9ecd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Sep 2012 19:05:28 +0200
Subject: [PATCH 13/16] only enable pcscd.socket by default

---
 90-default.preset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/90-default.preset b/90-default.preset
index fd7c229..58a92e3 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -47,7 +47,7 @@ enable lm_sensors.service
 enable mcelog.*
 enable acpid.*
 enable smartd.service
-enable pcscd.*
+enable pcscd.socket
 
 # Other stuff
 enable abrtd.service

From bd0400e3745c62133daed5236856b3756b4c3217 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Sep 2012 19:05:39 +0200
Subject: [PATCH 14/16] ghost /etc/timezone

---
 systemd.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index 9c2d729..85fe6ef 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -237,7 +237,6 @@ glib-based applications using libudev functionality.
 /usr/bin/touch %{buildroot}%{_sysconfdir}/locale.conf
 /usr/bin/touch %{buildroot}%{_sysconfdir}/machine-id
 /usr/bin/touch %{buildroot}%{_sysconfdir}/machine-info
-/usr/bin/touch %{buildroot}%{_sysconfdir}/timezone
 /usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
 /usr/bin/touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 
@@ -424,7 +423,6 @@ fi
 %ghost %config(noreplace) %{_sysconfdir}/locale.conf
 %ghost %config(noreplace) %{_sysconfdir}/machine-id
 %ghost %config(noreplace) %{_sysconfdir}/machine-info
-%ghost %config(noreplace) %{_sysconfdir}/timezone
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 %{_bindir}/systemd
 %{_bindir}/systemctl

From 7b4894e0bc03e583224740f5e85a158d26843b8a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Sep 2012 21:29:13 +0200
Subject: [PATCH 15/16] add missing commit from master from Ray

---
 systemd.spec | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index 85fe6ef..4d4eac1 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,8 +21,8 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
 # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE
 # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
 
-Version:        189
-Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
+Version:        190
+Release:        1%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -50,6 +50,7 @@ BuildRequires:  usbutils >= 0.82
 BuildRequires:  intltool >= 0.40.0
 BuildRequires:  gperf
 BuildRequires:  gtk-doc
+BuildRequires:  python2-devel
 %if %{defined gitcommit}
 BuildRequires:  automake
 BuildRequires:  autoconf
@@ -156,6 +157,14 @@ initialization at boot.
 'systemd-analyze plot' renders an SVG visualizing the parallel start of units
 at boot.
 
+%package python
+Summary:        Python Bindings for systemd
+License:        LGPLv2+
+Requires:       %{name} = %{version}-%{release}
+
+%description python
+This package contains python binds for systemd APIs
+
 %package -n libgudev1
 Summary:        Libraries for adding libudev support to applications that use glib
 Conflicts:      filesystem < 3
@@ -237,6 +246,7 @@ glib-based applications using libudev functionality.
 /usr/bin/touch %{buildroot}%{_sysconfdir}/locale.conf
 /usr/bin/touch %{buildroot}%{_sysconfdir}/machine-id
 /usr/bin/touch %{buildroot}%{_sysconfdir}/machine-info
+/usr/bin/touch %{buildroot}%{_sysconfdir}/localtime
 /usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
 /usr/bin/touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 
@@ -314,6 +324,16 @@ else
         /usr/bin/rm -f /etc/systemd/system/sysinit.target.wants/hwclock-load.service >/dev/null 2>&1 || :
 fi
 
+# Migrate /etc/sysconfig/clock
+if [ ! -L /etc/localtime -a -e /etc/sysconfig/clock ] ; then
+       . /etc/sysconfig/clock 2>&1 || :
+       if [ -n "$ZONE" -a -e "/usr/share/zoneinfo/$ZONE" ] ; then
+              /usr/bin/ln -sf "../usr/share/zoneinfo/$ZONE" /etc/localtime >/dev/null 2>&1 || :
+       fi
+fi
+/usr/bin/rm -f /etc/sysconfig/clock >/dev/null 2>&1 || :
+
+%posttrans
 # Convert old /etc/sysconfig/desktop settings
 preferred=
 if [ -f /etc/sysconfig/desktop ]; then
@@ -419,6 +439,7 @@ fi
 %{_sysconfdir}/rpm/macros.systemd
 %{_sysconfdir}/xdg/systemd
 %ghost %config(noreplace) %{_sysconfdir}/hostname
+%ghost %config(noreplace) %{_sysconfdir}/localtime
 %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
 %ghost %config(noreplace) %{_sysconfdir}/locale.conf
 %ghost %config(noreplace) %{_sysconfdir}/machine-id
@@ -532,6 +553,15 @@ fi
 %files analyze
 %{_bindir}/systemd-analyze
 
+%files python
+%{python_sitearch}/systemd/__init__.py
+%{python_sitearch}/systemd/__init__.pyc
+%{python_sitearch}/systemd/__init__.pyo
+%{python_sitearch}/systemd/_journal.so
+%{python_sitearch}/systemd/journal.py
+%{python_sitearch}/systemd/journal.pyc
+%{python_sitearch}/systemd/journal.pyo
+
 %files -n libgudev1
 %{_libdir}/libgudev-1.0.so.*
 %{_libdir}/girepository-1.0/GUdev-1.0.typelib
@@ -547,6 +577,43 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Sep 20 2012 Lennart Poettering <lpoetter@redhat.com> - 190-1
+- New upstream release
+- Take possession of /etc/localtime, and remove /etc/sysconfig/clock
+- https://bugzilla.redhat.com/show_bug.cgi?id=858780
+- https://bugzilla.redhat.com/show_bug.cgi?id=858787
+- https://bugzilla.redhat.com/show_bug.cgi?id=858771
+- https://bugzilla.redhat.com/show_bug.cgi?id=858754
+- https://bugzilla.redhat.com/show_bug.cgi?id=858746
+- https://bugzilla.redhat.com/show_bug.cgi?id=858266
+- https://bugzilla.redhat.com/show_bug.cgi?id=858224
+- https://bugzilla.redhat.com/show_bug.cgi?id=857670
+- https://bugzilla.redhat.com/show_bug.cgi?id=856975
+- https://bugzilla.redhat.com/show_bug.cgi?id=855863
+- https://bugzilla.redhat.com/show_bug.cgi?id=851970
+- https://bugzilla.redhat.com/show_bug.cgi?id=851275
+- https://bugzilla.redhat.com/show_bug.cgi?id=851131
+- https://bugzilla.redhat.com/show_bug.cgi?id=847472
+- https://bugzilla.redhat.com/show_bug.cgi?id=847207
+- https://bugzilla.redhat.com/show_bug.cgi?id=846483
+- https://bugzilla.redhat.com/show_bug.cgi?id=846085
+- https://bugzilla.redhat.com/show_bug.cgi?id=845973
+- https://bugzilla.redhat.com/show_bug.cgi?id=845194
+- https://bugzilla.redhat.com/show_bug.cgi?id=845028
+- https://bugzilla.redhat.com/show_bug.cgi?id=844630
+- https://bugzilla.redhat.com/show_bug.cgi?id=839736
+- https://bugzilla.redhat.com/show_bug.cgi?id=835848
+- https://bugzilla.redhat.com/show_bug.cgi?id=831740
+- https://bugzilla.redhat.com/show_bug.cgi?id=823485
+- https://bugzilla.redhat.com/show_bug.cgi?id=821813
+- https://bugzilla.redhat.com/show_bug.cgi?id=807886
+- https://bugzilla.redhat.com/show_bug.cgi?id=802198
+- https://bugzilla.redhat.com/show_bug.cgi?id=767795
+- https://bugzilla.redhat.com/show_bug.cgi?id=767561
+- https://bugzilla.redhat.com/show_bug.cgi?id=752774
+- https://bugzilla.redhat.com/show_bug.cgi?id=732874
+- https://bugzilla.redhat.com/show_bug.cgi?id=858735
+
 * Thu Sep 13 2012 Lennart Poettering <lpoetter@redhat.com> - 189-4
 - Don't pull in pkg-config as dep
 - https://bugzilla.redhat.com/show_bug.cgi?id=852828
@@ -562,6 +629,12 @@ fi
 * Thu Aug 23 2012 Lennart Poettering <lpoetter@redhat.com> - 189-1
 - New upstream release
 
+* Thu Aug 16 2012 Ray Strode <rstrode@redhat.com> 188-4
+- more scriptlet fixes
+  (move dm migration logic to %posttrans so the service
+   files it's looking for are available at the time
+   the logic is run)
+
 * Sat Aug 11 2012 Lennart Poettering <lpoetter@redhat.com> - 188-3
 - Remount file systems MS_PRIVATE before switching roots
 - https://bugzilla.redhat.com/show_bug.cgi?id=847418

From e7fd3d9c7dd572a400c6a15b7c7e39adb3aa07ca Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Sep 2012 21:32:02 +0200
Subject: [PATCH 16/16] upload tarball

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index b91e82c..e21ceae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac2eb313f5dce79622f60aac56bca66d  systemd-189.tar.xz
+8b5750f0c57fb35bf2046ad42ba149d1  systemd-190.tar.xz