Revert: Mv /etc/systemd/{system,user} to /opt/etc/systemd/

No more modules to modify /etc/systemd.

Change-Id: I39d5303a79201bf9573b83c66b5c64232e67ffae

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index e4dd9e6..b300b20 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -326,13 +326,6 @@ ln -sf ./libsystemd.pc %{buildroot}%{_libdir}/pkgconfig/libsystemd-login.pc
 /usr/bin/mkdir -p /etc/systemd/network
 /usr/bin/ln -sf /dev/null /etc/systemd/network/99-default.link
 
-# link system, user unit directory in conf dir to opt conf dir
-/usr/bin/mkdir -p /opt/etc/systemd
-/usr/bin/mv /etc/systemd/system /opt/etc/systemd/system
-/usr/bin/mv /etc/systemd/user /opt/etc/systemd/user
-/usr/bin/ln -s ../../opt/etc/systemd/system /etc/systemd/system
-/usr/bin/ln -s ../../opt/etc/systemd/user /etc/systemd/user
-
 # Set the smack label of executable binary tools
 chsmack %{_bindir}/bootctl -a "System::Tools"
 chsmack %{_bindir}/busctl -a "System::Tools" -e "System"
@@ -433,8 +426,8 @@ fi
 %{_bindir}/timedatectl
 %endif
 %dir %{_sysconfdir}/systemd
-%{_sysconfdir}/systemd/system
-%{_sysconfdir}/systemd/user
+%dir %{_sysconfdir}/systemd/system
+%dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/tmpfiles.d
 %dir %{_sysconfdir}/sysctl.d
 %dir %{_sysconfdir}/modules-load.d