specfile: services from /usr/lib/systemd moved to /usr/libexec

9 files changed, 15 insertions, 14 deletions

diff --git a/initscripts.spec b/initscripts.spec
index db9aa657..0435b990 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -288,8 +288,9 @@ fi
 %{_sbindir}/genhostid
 %{_sbindir}/service
 
-%{_prefix}/lib/systemd/import-state
-%{_prefix}/lib/systemd/loadmodules
+%{_libexecdir}/import-state
+%{_libexecdir}/loadmodules
+
 %{_prefix}/lib/systemd/system/import-state.service
 %{_prefix}/lib/systemd/system/loadmodules.service
 %{_prefix}/lib/udev/rename_device
@@ -338,7 +339,7 @@ fi
 %config(noreplace) %{_sysconfdir}/statetab
 %config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
 
-%{_prefix}/lib/systemd/readonly-root
+%{_libexecdir}/readonly-root
 %{_prefix}/lib/systemd/system/readonly-root.service
 
 # =============================================================================
diff --git a/po/Makefile b/po/Makefile
index 49a403f5..abb0258d 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,7 +3,7 @@
 # Supports standard GNU Makefile variables for specifying the paths:
 # * prefix
 # * sbindir
-# * libdir
+# * libexecdir
 # * datarootdir
 # * datadir
 # * sysconfdir
@@ -16,7 +16,7 @@ SHELL       = /bin/bash
 # here, as it just complicates things even further.
 prefix      = /usr
 sbindir     = $(prefix)/sbin
-libdir      = $(prefix)/lib
+libexecdir  = $(prefix)/libexec
 datarootdir = $(prefix)/share
 datadir     = $(datarootdir)
 sysconfdir  = /etc
@@ -29,9 +29,9 @@ FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
 
 POTFILES    = $(shell ls ../network-scripts/* | grep -v ifcfg-) \
 	..$(sbindir)/service \
-	..$(libdir)/systemd/import-state \
-	..$(libdir)/systemd/loadmodules \
-	..$(libdir)/systemd/readonly-root \
+	..$(libexecdir)/import-state \
+	..$(libexecdir)/loadmodules \
+	..$(libexecdir)/readonly-root \
 	..$(sysconfdir)/rc.d/init.d/*\
 
 
diff --git a/po/initscripts.pot b/po/initscripts.pot
index a4c1e33a..890750e9 100644
--- a/po/initscripts.pot
+++ b/po/initscripts.pot
@@ -131,11 +131,11 @@ msgstr ""
 msgid " failed; no link present.  Check cable?"
 msgstr ""
 
-#: ../network-scripts/ifup-eth:220 ../network-scripts/ifup-eth:361 
+#: ../network-scripts/ifup-eth:220 ../network-scripts/ifup-eth:362 
 msgid " done."
 msgstr ""
 
-#: ../network-scripts/ifup-eth:223 ../network-scripts/ifup-eth:363 
+#: ../network-scripts/ifup-eth:223 ../network-scripts/ifup-eth:364 
 msgid " failed."
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Error adding default gateway for ${REALDEVICE}."
 msgstr ""
 
-#: ../network-scripts/ifup-eth:354 
+#: ../network-scripts/ifup-eth:355 
 msgid "Determining IPv6 information for ${DEVICE}..."
 msgstr ""
 
diff --git a/usr/lib/systemd/system/import-state.service b/usr/lib/systemd/system/import-state.service
index 2aab4301..64237a09 100644
--- a/usr/lib/systemd/system/import-state.service
+++ b/usr/lib/systemd/system/import-state.service
@@ -8,7 +8,7 @@ Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup
 After=local-fs.target
 
 [Service]
-ExecStart=/usr/lib/systemd/import-state
+ExecStart=/usr/libexec/import-state
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
diff --git a/usr/lib/systemd/system/loadmodules.service b/usr/lib/systemd/system/loadmodules.service
index cba281a5..85e807f7 100644
--- a/usr/lib/systemd/system/loadmodules.service
+++ b/usr/lib/systemd/system/loadmodules.service
@@ -7,7 +7,7 @@ ConditionPathExists=|/etc/rc.modules
 ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/
 
 [Service]
-ExecStart=/usr/lib/systemd/loadmodules
+ExecStart=/usr/libexec/loadmodules
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
diff --git a/usr/lib/systemd/system/readonly-root.service b/usr/lib/systemd/system/readonly-root.service
index 83af6acd..26d4a118 100644
--- a/usr/lib/systemd/system/readonly-root.service
+++ b/usr/lib/systemd/system/readonly-root.service
@@ -6,7 +6,7 @@ Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup
 After=systemd-remount-fs.service
 
 [Service]
-ExecStart=/usr/lib/systemd/readonly-root
+ExecStart=/usr/libexec/readonly-root
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
diff --git a/usr/lib/systemd/import-state b/usr/libexec/import-state
index be2d13eb..be2d13eb 100755
--- a/usr/lib/systemd/import-state
+++ b/usr/libexec/import-state
diff --git a/usr/lib/systemd/loadmodules b/usr/libexec/loadmodules
index 4fd167c4..4fd167c4 100755
--- a/usr/lib/systemd/loadmodules
+++ b/usr/libexec/loadmodules
diff --git a/usr/lib/systemd/readonly-root b/usr/libexec/readonly-root
index a3679580..a3679580 100755
--- a/usr/lib/systemd/readonly-root
+++ b/usr/libexec/readonly-root