fedora-* services renamed to more general names

  This removes the OS flavour embedded into the initscripts. See also:
  https://bugzilla.redhat.com/show_bug.cgi?id=1584645

  Resolves: #161

11 files changed, 52 insertions, 46 deletions

diff --git a/initscripts.spec b/initscripts.spec
index ae9a65c8..0a3209b4 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -131,7 +131,7 @@ touch %{buildroot}%{_sbindir}/ifdown
 # ---------------
 
 %post
-%systemd_post fedora-domainname.service fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_post nis-domainname.service import-state.service loadmodules.service readonly-root.service
 
 chkconfig --add network > /dev/null 2>&1 || :
 chkconfig --add netconsole > /dev/null 2>&1 || :
@@ -146,7 +146,7 @@ chkconfig --add netconsole > /dev/null 2>&1 || :
 # ---------------
 
 %preun
-%systemd_preun fedora-domainname.service fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_preun nis-domainname.service import-state.service loadmodules.service readonly-root.service
 
 if [ $1 -eq 0 ]; then
   chkconfig --del network > /dev/null 2>&1 || :
@@ -157,7 +157,7 @@ fi
 # ---------------
 
 %postun
-%systemd_postun fedora-domainname.service fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_postun nis-domainname.service import-state.service loadmodules.service readonly-root.service
 
 # === PACKAGING INSTRUCTIONS ==================================================
 
@@ -211,7 +211,10 @@ fi
 
 %attr(4755,root,root) %{_sbindir}/usernetctl
 
-%{_prefix}/lib/systemd/fedora-*
+%{_prefix}/lib/systemd/import-state
+%{_prefix}/lib/systemd/loadmodules
+%{_prefix}/lib/systemd/nis-domainname
+%{_prefix}/lib/systemd/readonly-root
 %{_prefix}/lib/systemd/system/*
 %{_prefix}/lib/udev/rename_device
 
diff --git a/po/Makefile b/po/Makefile
index dedfc494..0855db87 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -29,7 +29,10 @@ FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
 
 POTFILES    = $(shell ls ../network-scripts/* | grep -v ifcfg-) \
 	..$(sbindir)/service \
-	..$(libdir)/systemd/fedora-* \
+	..$(libdir)/systemd/import-state \
+	..$(libdir)/systemd/loadmodules \
+	..$(libdir)/systemd/nis-domainname \
+	..$(libdir)/systemd/readonly-root \
 	..$(sysconfdir)/rc.d/init.d/*\
 
 
diff --git a/po/initscripts.pot b/po/initscripts.pot
index 5d4ec9c9..a4c1e33a 100644
--- a/po/initscripts.pot
+++ b/po/initscripts.pot
@@ -87,23 +87,23 @@ msgstr ""
 msgid "error iN $FILE: didn't specify netmask or prefix"
 msgstr ""
 
-#: ../network-scripts/ifup-aliases:239 ../network-scripts/ifup-aliases:250 
+#: ../network-scripts/ifup-aliases:238 ../network-scripts/ifup-aliases:249 
 msgid "error in ifcfg-${parent_device}: files"
 msgstr ""
 
-#: ../network-scripts/ifup-aliases:271 
+#: ../network-scripts/ifup-aliases:269 
 msgid "Determining if ip address ${IPADDR} is already in use for device ${parent_device}..."
 msgstr ""
 
-#: ../network-scripts/ifup-aliases:275 
+#: ../network-scripts/ifup-aliases:273 
 msgid "Error, some other host ($ARPINGMAC) already uses address ${IPADDR}."
 msgstr ""
 
-#: ../network-scripts/ifup-aliases:337 
+#: ../network-scripts/ifup-aliases:334 
 msgid "error in $FILE: IPADDR_START and IPADDR_END don't agree"
 msgstr ""
 
-#: ../network-scripts/ifup-aliases:342 
+#: ../network-scripts/ifup-aliases:339 
 msgid "error in $FILE: IPADDR_START greater than IPADDR_END"
 msgstr ""
 
@@ -251,43 +251,43 @@ msgstr ""
 msgid "Usage: $0 {start|stop|reload|restart|showsysctl}"
 msgstr ""
 
-#: ../network-scripts/network-functions:416 
+#: ../network-scripts/network-functions:398 
 msgid "Both 'DHCP_HOSTNAME=${DHCP_HOSTNAME}' and 'DHCP_FQDN=${DHCP_FQDN}' are configured... Using DHCP_FQDN."
 msgstr ""
 
-#: ../network-scripts/network-functions:584 
+#: ../network-scripts/network-functions:566 
 msgid "Failed to set value '$value' [mode] to ${DEVICE} bonding device"
 msgstr ""
 
-#: ../network-scripts/network-functions:590 
+#: ../network-scripts/network-functions:572 
 msgid "Failed to set value '$value' [miimon] to ${DEVICE} bonding device"
 msgstr ""
 
-#: ../network-scripts/network-functions:610 
+#: ../network-scripts/network-functions:592 
 msgid "Failed to set '$arp_ip' value [arp_ip_target] to ${DEVICE} bonding device"
 msgstr ""
 
-#: ../network-scripts/network-functions:618 
+#: ../network-scripts/network-functions:600 
 msgid "Failed to set '$value' value [arp_ip_target] to ${DEVICE} bonding device"
 msgstr ""
 
-#: ../network-scripts/network-functions:623 
+#: ../network-scripts/network-functions:605 
 msgid "Failed to set '$value' value [$key] to ${DEVICE} bonding device"
 msgstr ""
 
-#: ../network-scripts/network-functions:696 
+#: ../network-scripts/network-functions:678 
 msgid "DEBUG     "
 msgstr ""
 
-#: ../network-scripts/network-functions:699 
+#: ../network-scripts/network-functions:681 
 msgid "ERROR     "
 msgstr ""
 
-#: ../network-scripts/network-functions:702 
+#: ../network-scripts/network-functions:684 
 msgid "WARN      "
 msgstr ""
 
-#: ../network-scripts/network-functions:705 
+#: ../network-scripts/network-functions:687 
 msgid "INFO      "
 msgstr ""
 
@@ -487,87 +487,87 @@ msgstr ""
 msgid "Reloading systemd: "
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:248 ../etc/rc.d/init.d/functions:286 
+#: ../etc/rc.d/init.d/functions:235 ../etc/rc.d/init.d/functions:273 
 msgid "$0: Usage: daemon [+/-nicelevel] {program}"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:329 ../etc/rc.d/init.d/functions:329 
+#: ../etc/rc.d/init.d/functions:316 ../etc/rc.d/init.d/functions:316 
 msgid "$base startup"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:339 ../etc/rc.d/init.d/functions:358 
+#: ../etc/rc.d/init.d/functions:326 ../etc/rc.d/init.d/functions:345 
 msgid "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:348 ../etc/rc.d/init.d/functions:475 
+#: ../etc/rc.d/init.d/functions:335 ../etc/rc.d/init.d/functions:462 
 msgid "-b option can be used only with -p"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:349 
+#: ../etc/rc.d/init.d/functions:336 
 msgid "Usage: killproc -p pidfile -b binary program"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:378 ../etc/rc.d/init.d/functions:388 ../etc/rc.d/init.d/functions:388 ../etc/rc.d/init.d/functions:403 
+#: ../etc/rc.d/init.d/functions:365 ../etc/rc.d/init.d/functions:375 ../etc/rc.d/init.d/functions:375 ../etc/rc.d/init.d/functions:390 
 msgid "$base shutdown"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:394 ../etc/rc.d/init.d/functions:394 
+#: ../etc/rc.d/init.d/functions:381 ../etc/rc.d/init.d/functions:381 
 msgid "$base $killlevel"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:421 
+#: ../etc/rc.d/init.d/functions:408 
 msgid "Usage: pidfileofproc {program}"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:436 
+#: ../etc/rc.d/init.d/functions:423 
 msgid "Usage: pidofproc [-p pidfile] {program}"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:462 
+#: ../etc/rc.d/init.d/functions:449 
 msgid "Usage: status [-p pidfile] {program}"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:476 
+#: ../etc/rc.d/init.d/functions:463 
 msgid "Usage: status -p pidfile -b binary program"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:503 ../etc/rc.d/init.d/functions:509 
+#: ../etc/rc.d/init.d/functions:490 ../etc/rc.d/init.d/functions:496 
 msgid "${base} (pid $pid) is running..."
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:513 
+#: ../etc/rc.d/init.d/functions:500 
 msgid "${base} dead but pid file exists"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:517 
+#: ../etc/rc.d/init.d/functions:504 
 msgid "${base} status unknown due to insufficient privileges."
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:526 
+#: ../etc/rc.d/init.d/functions:513 
 msgid "${base} dead but subsys locked"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:529 
+#: ../etc/rc.d/init.d/functions:516 
 msgid "${base} is stopped"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:537 
+#: ../etc/rc.d/init.d/functions:524 
 msgid "  OK  "
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:548 
+#: ../etc/rc.d/init.d/functions:535 
 msgid "FAILED"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:559 
+#: ../etc/rc.d/init.d/functions:546 
 msgid "PASSED"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:570 
+#: ../etc/rc.d/init.d/functions:557 
 msgid "WARNING"
 msgstr ""
 
-#: ../etc/rc.d/init.d/functions:620 ../etc/rc.d/init.d/functions:620 
+#: ../etc/rc.d/init.d/functions:607 ../etc/rc.d/init.d/functions:607 
 msgid "$STRING"
 msgstr ""
 
diff --git a/usr/lib/systemd/fedora-import-state b/usr/lib/systemd/import-state
index 85bc4817..be2d13eb 100755
--- a/usr/lib/systemd/fedora-import-state
+++ b/usr/lib/systemd/import-state
@@ -1,5 +1,5 @@
 #!/bin/bash
-# fedora-import-state: import state files from initramfs (e.g. network config)
+# import-state: import state files from initramfs (e.g. network config)
 
 # Copy state into root folder:
 # ============================
diff --git a/usr/lib/systemd/fedora-loadmodules b/usr/lib/systemd/loadmodules
index 4fd167c4..4fd167c4 100755
--- a/usr/lib/systemd/fedora-loadmodules
+++ b/usr/lib/systemd/loadmodules
diff --git a/usr/lib/systemd/fedora-domainname b/usr/lib/systemd/nis-domainname
index 5c934584..5c934584 100755
--- a/usr/lib/systemd/fedora-domainname
+++ b/usr/lib/systemd/nis-domainname
diff --git a/usr/lib/systemd/fedora-readonly b/usr/lib/systemd/readonly-root
index a3679580..a3679580 100755
--- a/usr/lib/systemd/fedora-readonly
+++ b/usr/lib/systemd/readonly-root
diff --git a/usr/lib/systemd/system/fedora-import-state.service b/usr/lib/systemd/system/import-state.service
index b43ac29f..2aab4301 100644
--- a/usr/lib/systemd/system/fedora-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/fedora-import-state
+ExecStart=/usr/lib/systemd/import-state
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
diff --git a/usr/lib/systemd/system/fedora-loadmodules.service b/usr/lib/systemd/system/loadmodules.service
index 641e7711..cba281a5 100644
--- a/usr/lib/systemd/system/fedora-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/fedora-loadmodules
+ExecStart=/usr/lib/systemd/loadmodules
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
diff --git a/usr/lib/systemd/system/fedora-domainname.service b/usr/lib/systemd/system/nis-domainname.service
index b62e52b1..3f8412ae 100644
--- a/usr/lib/systemd/system/fedora-domainname.service
+++ b/usr/lib/systemd/system/nis-domainname.service
@@ -5,7 +5,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 
 [Service]
-ExecStart=/usr/lib/systemd/fedora-domainname
+ExecStart=/usr/lib/systemd/nis-domainname
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/usr/lib/systemd/system/fedora-readonly.service b/usr/lib/systemd/system/readonly-root.service
index 30530219..83af6acd 100644
--- a/usr/lib/systemd/system/fedora-readonly.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/fedora-readonly
+ExecStart=/usr/lib/systemd/readonly-root
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes