From 301de5d4da1231689f97aaaa714f76f5834492bf Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sep 12 2012 23:04:00 +0000
Subject: update preset list


---

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