diff options
| author | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2017-10-19 12:13:45 +0200 |
|---|---|---|
| committer | Dee'Kej <deekej@linuxmail.org> | 2017-10-31 12:39:18 +0100 |
| commit | 995e8ad74f5a6bc51f28c0be4ed02c547e0891d6 (patch) | |
| tree | 74fc4a79f5597227a811d7001dc17b416fc6423c /systemd | |
| parent | c200aed368884f278bd6c9e43050fa812439c0e4 (diff) | |
| download | initscripts-995e8ad74f5a6bc51f28c0be4ed02c547e0891d6.tar initscripts-995e8ad74f5a6bc51f28c0be4ed02c547e0891d6.tar.gz initscripts-995e8ad74f5a6bc51f28c0be4ed02c547e0891d6.tar.bz2 initscripts-995e8ad74f5a6bc51f28c0be4ed02c547e0891d6.tar.xz initscripts-995e8ad74f5a6bc51f28c0be4ed02c547e0891d6.zip | |
systemd/system: symlinks for initscripts' services removed
The symlinks are no longer needed. Enablement of default services
is now managed by 'redhat-release' package.
Resolves: #1395391
Resolves: #1357648
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/system/rhel-autorelabel-mark.service | 5 | ||||
| -rw-r--r-- | systemd/system/rhel-autorelabel.service | 5 | ||||
| -rw-r--r-- | systemd/system/rhel-configure.service | 5 | ||||
| -rw-r--r-- | systemd/system/rhel-domainname.service | 4 | ||||
| -rw-r--r-- | systemd/system/rhel-import-state.service | 7 | ||||
| -rw-r--r-- | systemd/system/rhel-loadmodules.service | 5 | ||||
| -rw-r--r-- | systemd/system/rhel-readonly.service | 5 |
7 files changed, 27 insertions, 9 deletions
diff --git a/systemd/system/rhel-autorelabel-mark.service b/systemd/system/rhel-autorelabel-mark.service index 33b5147b..9a7fb878 100644 --- a/systemd/system/rhel-autorelabel-mark.service +++ b/systemd/system/rhel-autorelabel-mark.service @@ -10,6 +10,9 @@ ConditionPathIsDirectory=/etc/selinux ConditionPathExists=!/.autorelabel [Service] -ExecStart=-/bin/touch /.autorelabel +ExecStart=-/usr/bin/touch /.autorelabel Type=oneshot RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/systemd/system/rhel-autorelabel.service b/systemd/system/rhel-autorelabel.service index d277cf86..0f11c52e 100644 --- a/systemd/system/rhel-autorelabel.service +++ b/systemd/system/rhel-autorelabel.service @@ -10,8 +10,11 @@ ConditionKernelCommandLine=|autorelabel ConditionPathExists=|/.autorelabel [Service] -ExecStart=/lib/systemd/rhel-autorelabel +ExecStart=/usr/lib/systemd/rhel-autorelabel Type=oneshot TimeoutSec=0 RemainAfterExit=yes StandardInput=tty + +[Install] +WantedBy=sysinit.target diff --git a/systemd/system/rhel-configure.service b/systemd/system/rhel-configure.service index 7ee34ceb..68fbe788 100644 --- a/systemd/system/rhel-configure.service +++ b/systemd/system/rhel-configure.service @@ -7,9 +7,12 @@ After=local-fs.target ConditionPathExists=/.unconfigured [Service] -ExecStart=/lib/systemd/rhel-configure +ExecStart=/usr/lib/systemd/rhel-configure ExecStopPost=/bin/rm -f /.unconfigured Type=oneshot TimeoutSec=0 StandardInput=tty RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/rhel-domainname.service b/systemd/system/rhel-domainname.service index e4deb8c1..633693a5 100644 --- a/systemd/system/rhel-domainname.service +++ b/systemd/system/rhel-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/rhel-domainname +ExecStart=/usr/lib/systemd/rhel-domainname Type=oneshot RemainAfterExit=yes diff --git a/systemd/system/rhel-import-state.service b/systemd/system/rhel-import-state.service index 182b0f99..d4b78a7f 100644 --- a/systemd/system/rhel-import-state.service +++ b/systemd/system/rhel-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/rhel-import-state +ExecStart=/usr/lib/systemd/rhel-import-state Type=oneshot TimeoutSec=0 RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/systemd/system/rhel-loadmodules.service b/systemd/system/rhel-loadmodules.service index a834e042..746b3c27 100644 --- a/systemd/system/rhel-loadmodules.service +++ b/systemd/system/rhel-loadmodules.service @@ -8,7 +8,10 @@ ConditionPathExists=|/etc/rc.modules ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ [Service] -ExecStart=/lib/systemd/rhel-loadmodules +ExecStart=/usr/lib/systemd/rhel-loadmodules Type=oneshot TimeoutSec=0 RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/systemd/system/rhel-readonly.service b/systemd/system/rhel-readonly.service index 3ee1895d..c89edf81 100644 --- a/systemd/system/rhel-readonly.service +++ b/systemd/system/rhel-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/rhel-readonly +ExecStart=/usr/lib/systemd/rhel-readonly Type=oneshot TimeoutSec=0 RemainAfterExit=yes + +[Install] +WantedBy=local-fs.target |