From 3c3608d36e96ab0ecf837c65e15a2fc61f4c1c1a Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Oct 24 2012 16:36:56 +0000
Subject: add dmraid-activation.service to the default preset


- add yum protected.d fragment
- https://bugzilla.redhat.com/show_bug.cgi?id=869619
- https://bugzilla.redhat.com/show_bug.cgi?id=869717

---

diff --git a/90-default.preset b/90-default.preset
index 8dd812e..7fec5f7 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -32,6 +32,7 @@ enable libstoragemgmt.service
 enable lvm2-monitor.*
 enable lvm2-lvmetad.*
 enable dm-event.*
+enable dmraid-activation.service
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=855372
 enable mdmonitor.service
diff --git a/systemd.spec b/systemd.spec
index b2f80a3..2483a5e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
 # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
 
 Version:        195
-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
@@ -81,6 +81,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
+# Prevent accidental removal of the systemd package
+Source6:        yum-protect-systemd.conf
 
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -277,6 +279,10 @@ glib-based applications using libudev functionality.
 /usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
 /usr/bin/install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/
 
+# Install yum protection fragment
+/usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/yum/protected.d/
+/usr/bin/install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum/protected.d/systemd.conf
+
 # To avoid making life hard for Rawhide-using developers, don't package the
 # kernel.core_pattern setting until systemd-coredump is a part of an actual
 # systemd release and it's made clear how to get the core dumps out of the
@@ -522,6 +528,7 @@ fi
 %config(noreplace) %{_sysconfdir}/udev/udev.conf
 %config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/udlfb.conf
+%config(noreplace) %{_sysconfdir}/yum/protected.d/systemd.conf
 %{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh
 %{_sysconfdir}/rpm/macros.systemd
 %{_sysconfdir}/xdg/systemd
@@ -671,6 +678,12 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Oct 24 2012 Michal Schmidt <mschmidt@redhat.com> - 195-4
+- add dmraid-activation.service to the default preset
+- add yum protected.d fragment
+- https://bugzilla.redhat.com/show_bug.cgi?id=869619
+- https://bugzilla.redhat.com/show_bug.cgi?id=869717
+
 * Wed Oct 24 2012 Kay Sievers <kay@redhat.com> - 195-3
 - Migrate /etc/sysconfig/ i18n, keyboard, network files/variables to
   systemd native files
diff --git a/yum-protect-systemd.conf b/yum-protect-systemd.conf
new file mode 100644
index 0000000..24ad079
--- /dev/null
+++ b/yum-protect-systemd.conf
@@ -0,0 +1 @@
+systemd