From 24a643009827655acda9291dec927dd68e0f1e15 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Fri, 11 May 2012 13:28:42 -0400
Subject: [PATCH] Fix systemd unit cleanup in runtime-postinstall

A lot of the systemd unit files got moved around due to UsrMove, so
these lines weren't removing the services as expected.

Fix the paths and they all work. This eliminates the "FAILED"
message from systemd-remount-api-vfs.service and plymouth-start.service.

Oh - and the ConsoleKit removal got dropped 'cuz ConsoleKit isn't in the
installer images anymore.
---
 share/runtime-postinstall.tmpl | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index b33ccc08..82d00d1c 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -23,16 +23,15 @@ remove etc/systemd/system/default.target
 remove etc/systemd/system/default.target.wants/*
 symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 ## remove/disable unwanted systemd services
-removefrom systemd-units /lib/systemd/system/kexec*
-removefrom systemd-units /lib/systemd/system/local-fs.target.wants/media.mount
-removefrom systemd-units /lib/systemd/system/media.mount
-removefrom systemd-units /lib/systemd/system/*plymouth*
-removefrom systemd-units /lib/systemd/system/quota*.service
-removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service
-removefrom ConsoleKit /lib/systemd/system/*
-removefrom initscripts /lib/systemd/system/local-fs.target.wants/fedora-storage* /lib/systemd/system/basic.target.wants/*
-removefrom lvm2 /lib/systemd/system/*
-removefrom mdadm /lib/systemd/system/*
+removefrom systemd /usr/lib/systemd/system/kexec*
+removefrom systemd /usr/lib/systemd/system/local-fs.target.wants/media.mount
+removefrom systemd /usr/lib/systemd/system/media.mount
+removefrom systemd /usr/lib/systemd/system/*plymouth*
+removefrom systemd /usr/lib/systemd/system/quota*.service
+removefrom systemd /usr/lib/systemd/system/systemd-remount-api-vfs.service
+removefrom initscripts */lib/systemd/system/local-fs.target.wants/fedora-storage*.service */lib/systemd/system/basic.target.wants/*.service
+removefrom lvm2 */lib/systemd/system/*
+removefrom mdadm */lib/systemd/system/*
 
 ## install some basic configuration files
 append etc/resolv.conf ""