aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--initscripts.spec3
-rw-r--r--systemd/prefdm.service1
-rw-r--r--systemd/rc-local.service3
4 files changed, 7 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 7168bc49..491dd31c 100644
--- a/Makefile
+++ b/Makefile
@@ -116,9 +116,12 @@ install:
ln -s halt $(ROOT)/etc/rc.d/init.d/reboot
- mkdir -p $(ROOT)/etc/systemd/system
- ln -s /lib/systemd/system/prefdm.service $(ROOT)/etc/systemd/system/display-manager.service
- ln -s /lib/systemd/system/reboot.target $(ROOT)/etc/systemd/system/ctrl-alt-del.target
+ mkdir -p -m 755 $(ROOT)/lib/systemd/system/multi-user.target.wants
+ mkdir -p -m 755 $(ROOT)/lib/systemd/system/graphical.target.wants
+ ln -s prefdm.service $(ROOT)/lib/systemd/system/display-manager.service
+ ln -s reboot.target $(ROOT)/lib/systemd/system/ctrl-alt-del.target
+ ln -s ../rc-local.service $(ROOT)/lib/systemd/system/multi-user.target.wants
+ ln -s ../display-manager.service $(ROOT)/lib/systemd/system/graphical.target.wants
# These are LSB compatibility symlinks. At some point in the future
# the actual files will be here instead of symlinks
diff --git a/initscripts.spec b/initscripts.spec
index ede235ed..38c0c1b1 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -97,7 +97,7 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi
rm -rf $RPM_BUILD_ROOT/etc/init
%endif
%if ! %{_with_systemd}
- rm -rf $RPM_BUILD_ROOT/etc/systemd $RPM_BUILD_ROOT/lib/systemd
+ rm -rf $RPM_BUILD_ROOT/lib/systemd
%endif
rm -f $RPM_BUILD_ROOT/etc/inittab.*
@@ -212,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/init/*
%endif
%if %{_with_systemd}
-%config(noreplace) /etc/systemd/system/*
/lib/systemd/system/*
%endif
%config /etc/X11/prefdm
diff --git a/systemd/prefdm.service b/systemd/prefdm.service
index bbdf0d37..60a5ed05 100644
--- a/systemd/prefdm.service
+++ b/systemd/prefdm.service
@@ -20,4 +20,3 @@ RestartSec=0
[Install]
Alias=display-manager.service
-WantedBy=graphical.target
diff --git a/systemd/rc-local.service b/systemd/rc-local.service
index 6be4fcf4..21ecfb23 100644
--- a/systemd/rc-local.service
+++ b/systemd/rc-local.service
@@ -14,6 +14,3 @@ TimeoutSec=0
StandardOutput=tty
RemainAfterExit=yes
SysVStartPriority=99
-
-[Install]
-WantedBy=multi-user.target