X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Ffedora%2Frc-local.service;h=58b59820e26555c841a946b34e21ac5342b1f2a9;hb=1f812feafb4b98d5cfa2934886bbdd43325780bb;hp=099bbabcd6086527e6808597beff4dc3e529d7fd;hpb=e6aad08ba82e44e88f9186eab30c68ceaf6370a3;p=elogind.git

diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index 099bbabcd..58b59820e 100644
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -1,23 +1,16 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
 Description=/etc/rc.local Compatibility
 Requires=basic.target
+After=basic.target
+Conflicts=shutdown.target
+Before=getty@tty1.service
 
 # The rcN.d symlink uses the name "local" while the script itself is
 # called "rc.local", hence carry both names here.
@@ -25,5 +18,7 @@ Names=rc-local.service local.service
 
 [Service]
 ExecStart=/etc/rc.local start
-Type=simple
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
 SysVStartPriority=99