From 5829c811dd082ac046846bb932d9d14fbc777c17 Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Tue, 17 Oct 2017 13:20:37 +0200
Subject: systemd/system: symlinks for fedora-* services removed

  The symlinks are no longer needed. Enablement of default services is
  now managed by 'fedora-release' package.
---
 systemd/system/fedora-domainname.service   | 4 ++--
 systemd/system/fedora-import-state.service | 7 +++++--
 systemd/system/fedora-loadmodules.service  | 5 ++++-
 systemd/system/fedora-readonly.service     | 5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'systemd')

diff --git a/systemd/system/fedora-domainname.service b/systemd/system/fedora-domainname.service
index d5e0ff54..b62e52b1 100644
--- a/systemd/system/fedora-domainname.service
+++ b/systemd/system/fedora-domainname.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Read and set NIS domainname from /etc/sysconfig/network
-Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service
+Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target
 DefaultDependencies=no
 Conflicts=shutdown.target
 
 [Service]
-ExecStart=/lib/systemd/fedora-domainname
+ExecStart=/usr/lib/systemd/fedora-domainname
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/systemd/system/fedora-import-state.service b/systemd/system/fedora-import-state.service
index e1aa0454..b43ac29f 100644
--- a/systemd/system/fedora-import-state.service
+++ b/systemd/system/fedora-import-state.service
@@ -4,11 +4,14 @@ DefaultDependencies=no
 ConditionPathIsReadWrite=/
 ConditionDirectoryNotEmpty=/run/initramfs/state
 Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service basic.target
+Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service sysinit.target
 After=local-fs.target
 
 [Service]
-ExecStart=/lib/systemd/fedora-import-state
+ExecStart=/usr/lib/systemd/fedora-import-state
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/systemd/system/fedora-loadmodules.service b/systemd/system/fedora-loadmodules.service
index 51285093..641e7711 100644
--- a/systemd/system/fedora-loadmodules.service
+++ b/systemd/system/fedora-loadmodules.service
@@ -7,7 +7,10 @@ ConditionPathExists=|/etc/rc.modules
 ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/
 
 [Service]
-ExecStart=/lib/systemd/fedora-loadmodules
+ExecStart=/usr/lib/systemd/fedora-loadmodules
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/systemd/system/fedora-readonly.service b/systemd/system/fedora-readonly.service
index 7a079445..30530219 100644
--- a/systemd/system/fedora-readonly.service
+++ b/systemd/system/fedora-readonly.service
@@ -6,7 +6,10 @@ Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup
 After=systemd-remount-fs.service
 
 [Service]
-ExecStart=/lib/systemd/fedora-readonly
+ExecStart=/usr/lib/systemd/fedora-readonly
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
+
+[Install]
+WantedBy=local-fs.target
-- 
cgit v1.2.1