[systemd: 2/2] systemd-204-6

[Harald Hoyer]

commit 2cfbb4e8fbf3b888742e91623696427e9ee711e6
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Jun 6 12:55:08 2013 +0200

    systemd-204-6
    
    - introduce 99-default-disable.preset

 90-default.preset         |    3 ---
 99-default-disable.preset |    1 +
 systemd.spec              |    8 +++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/90-default.preset b/90-default.preset
index ebac21c..c3f6ae0 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -90,6 +90,3 @@ enable udisks2.service
 enable polkit.service
 enable packagekit-offline-update.service
 enable PackageKit.service
-
-# Enforce Fedora's disable-by-default policy
-disable *
diff --git a/99-default-disable.preset b/99-default-disable.preset
new file mode 100644
index 0000000..1f29b50
--- /dev/null
+++ b/99-default-disable.preset
@@ -0,0 +1 @@
+disable *
diff --git a/systemd.spec b/systemd.spec
index a6d2130..68e9f9a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        204
-Release:        5%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        6%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -26,6 +26,7 @@ Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.t
 %endif
 # Fedora's default preset policy
 Source1:        90-default.preset
+Source7:        99-default-disable.preset
 Source5:        85-display-manager.preset
 # Feodora's SysV convert script. meh.
 Source2:        systemd-sysv-convert
@@ -259,6 +260,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/
 install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/
 install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -m 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system-preset/
 
 # Make sure the shutdown/sleep drop-in dirs exist
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/
@@ -636,6 +638,7 @@ fi
 %{_prefix}/lib/sysctl.d/50-default.conf
 %{_prefix}/lib/systemd/system-preset/85-display-manager.preset
 %{_prefix}/lib/systemd/system-preset/90-default.preset
+%{_prefix}/lib/systemd/system-preset/99-default-disable.preset
 %{_prefix}/lib/systemd/catalog/systemd.catalog
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
@@ -753,6 +756,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Jun 06 2013 Harald Hoyer <harald at redhat.com> 204-6
+- introduce 99-default-disable.preset
+
 * Thu Jun  6 2013 Lennart Poettering <lpoetter at redhat.com> - 204-5
 - Rename 90-display-manager.preset to 85-display-manager.preset so that it actually takes precedence over 90-default.preset's "disable *" line (#903690)