picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fedora: further unit tweaks

Browse source 
1) Just ship rc-local as-is; don't worry about the 'local' name.
2) Don't install rc-local and prefdm to /etc ; just enable them globally for the system in /lib.
This commit is contained in:
Bill Nottingham 2010-10-28 13:27:44 -04:00 committed by Lennart Poettering
parent 9524600eac
commit 73d35ff8e4
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.am
View file

@ -1175,13 +1175,10 @@ if TARGET_FEDORA
$(DESTDIR)$(systemunitdir)/rescue.target.wants \
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
rm -f prefdm.service && \
$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
@ -1204,8 +1201,8 @@ if TARGET_FEDORA
rm -f plymouth-halt.service && \
$(LN_S) ../plymouth-halt.service plymouth-halt.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service )
endif
if TARGET_GENTOO
( cd $(DESTDIR)$(pkgsysconfdir)/system && \

4
units/fedora/rc-local.service
View file

@ -9,10 +9,6 @@
Description=/etc/rc.local Compatibility
ConditionPathExists=/etc/rc.local
# The rcN.d symlink uses the name "local" while the script itself is
# called "rc.local", hence carry both names here.
Names=rc-local.service local.service
[Service]
Type=forking
Environment=TERM=linux