[PATCH lorax/master 1/7] Fix systemd unit cleanup in runtime-postinstall

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 b33ccc0..82d00d1 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 ""
-- 
1.7.10.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux