From a145ddda284570e57413e37f025c3657205e17d8 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 25 May 2018 20:01:54 +0200 Subject: Repository scheme updated to new layout NOTE: This commit just moves files around, without actually fixing the Makefiles and specfile. See follow up commits which resolve this. --- usr/lib/systemd/system/fedora-domainname.service | 13 +++++++++++++ usr/lib/systemd/system/fedora-import-state.service | 17 +++++++++++++++++ usr/lib/systemd/system/fedora-loadmodules.service | 16 ++++++++++++++++ usr/lib/systemd/system/fedora-readonly.service | 15 +++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 usr/lib/systemd/system/fedora-domainname.service create mode 100644 usr/lib/systemd/system/fedora-import-state.service create mode 100644 usr/lib/systemd/system/fedora-loadmodules.service create mode 100644 usr/lib/systemd/system/fedora-readonly.service (limited to 'usr/lib/systemd/system') diff --git a/usr/lib/systemd/system/fedora-domainname.service b/usr/lib/systemd/system/fedora-domainname.service new file mode 100644 index 00000000..b62e52b1 --- /dev/null +++ b/usr/lib/systemd/system/fedora-domainname.service @@ -0,0 +1,13 @@ +[Unit] +Description=Read and set NIS domainname from /etc/sysconfig/network +Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target +DefaultDependencies=no +Conflicts=shutdown.target + +[Service] +ExecStart=/usr/lib/systemd/fedora-domainname +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-import-state.service b/usr/lib/systemd/system/fedora-import-state.service new file mode 100644 index 00000000..b43ac29f --- /dev/null +++ b/usr/lib/systemd/system/fedora-import-state.service @@ -0,0 +1,17 @@ +[Unit] +Description=Import network configuration from initramfs +DefaultDependencies=no +ConditionPathIsReadWrite=/ +ConditionDirectoryNotEmpty=/run/initramfs/state +Conflicts=shutdown.target +Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service sysinit.target +After=local-fs.target + +[Service] +ExecStart=/usr/lib/systemd/fedora-import-state +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-loadmodules.service b/usr/lib/systemd/system/fedora-loadmodules.service new file mode 100644 index 00000000..641e7711 --- /dev/null +++ b/usr/lib/systemd/system/fedora-loadmodules.service @@ -0,0 +1,16 @@ +[Unit] +Description=Load legacy module configuration +DefaultDependencies=no +Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionPathExists=|/etc/rc.modules +ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ + +[Service] +ExecStart=/usr/lib/systemd/fedora-loadmodules +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-readonly.service b/usr/lib/systemd/system/fedora-readonly.service new file mode 100644 index 00000000..30530219 --- /dev/null +++ b/usr/lib/systemd/system/fedora-readonly.service @@ -0,0 +1,15 @@ +[Unit] +Description=Configure read-only root support +DefaultDependencies=no +Conflicts=shutdown.target +Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target systemd-random-seed.service +After=systemd-remount-fs.service + +[Service] +ExecStart=/usr/lib/systemd/fedora-readonly +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=local-fs.target -- cgit v1.2.1 From 37109fdf9808ffc87cfff5604c8ca445ffdec64c Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 30 May 2018 17:01:59 +0200 Subject: 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 --- usr/lib/systemd/system/fedora-domainname.service | 13 ------------- usr/lib/systemd/system/fedora-import-state.service | 17 ----------------- usr/lib/systemd/system/fedora-loadmodules.service | 16 ---------------- usr/lib/systemd/system/fedora-readonly.service | 15 --------------- usr/lib/systemd/system/import-state.service | 17 +++++++++++++++++ usr/lib/systemd/system/loadmodules.service | 16 ++++++++++++++++ usr/lib/systemd/system/nis-domainname.service | 13 +++++++++++++ usr/lib/systemd/system/readonly-root.service | 15 +++++++++++++++ 8 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 usr/lib/systemd/system/fedora-domainname.service delete mode 100644 usr/lib/systemd/system/fedora-import-state.service delete mode 100644 usr/lib/systemd/system/fedora-loadmodules.service delete mode 100644 usr/lib/systemd/system/fedora-readonly.service create mode 100644 usr/lib/systemd/system/import-state.service create mode 100644 usr/lib/systemd/system/loadmodules.service create mode 100644 usr/lib/systemd/system/nis-domainname.service create mode 100644 usr/lib/systemd/system/readonly-root.service (limited to 'usr/lib/systemd/system') diff --git a/usr/lib/systemd/system/fedora-domainname.service b/usr/lib/systemd/system/fedora-domainname.service deleted file mode 100644 index b62e52b1..00000000 --- a/usr/lib/systemd/system/fedora-domainname.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Read and set NIS domainname from /etc/sysconfig/network -Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target -DefaultDependencies=no -Conflicts=shutdown.target - -[Service] -ExecStart=/usr/lib/systemd/fedora-domainname -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-import-state.service b/usr/lib/systemd/system/fedora-import-state.service deleted file mode 100644 index b43ac29f..00000000 --- a/usr/lib/systemd/system/fedora-import-state.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Import network configuration from initramfs -DefaultDependencies=no -ConditionPathIsReadWrite=/ -ConditionDirectoryNotEmpty=/run/initramfs/state -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service sysinit.target -After=local-fs.target - -[Service] -ExecStart=/usr/lib/systemd/fedora-import-state -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-loadmodules.service b/usr/lib/systemd/system/fedora-loadmodules.service deleted file mode 100644 index 641e7711..00000000 --- a/usr/lib/systemd/system/fedora-loadmodules.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Load legacy module configuration -DefaultDependencies=no -Conflicts=shutdown.target -Before=sysinit.target shutdown.target -ConditionPathExists=|/etc/rc.modules -ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ - -[Service] -ExecStart=/usr/lib/systemd/fedora-loadmodules -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/fedora-readonly.service b/usr/lib/systemd/system/fedora-readonly.service deleted file mode 100644 index 30530219..00000000 --- a/usr/lib/systemd/system/fedora-readonly.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Configure read-only root support -DefaultDependencies=no -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target systemd-random-seed.service -After=systemd-remount-fs.service - -[Service] -ExecStart=/usr/lib/systemd/fedora-readonly -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=local-fs.target diff --git a/usr/lib/systemd/system/import-state.service b/usr/lib/systemd/system/import-state.service new file mode 100644 index 00000000..2aab4301 --- /dev/null +++ b/usr/lib/systemd/system/import-state.service @@ -0,0 +1,17 @@ +[Unit] +Description=Import network configuration from initramfs +DefaultDependencies=no +ConditionPathIsReadWrite=/ +ConditionDirectoryNotEmpty=/run/initramfs/state +Conflicts=shutdown.target +Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service sysinit.target +After=local-fs.target + +[Service] +ExecStart=/usr/lib/systemd/import-state +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/loadmodules.service b/usr/lib/systemd/system/loadmodules.service new file mode 100644 index 00000000..cba281a5 --- /dev/null +++ b/usr/lib/systemd/system/loadmodules.service @@ -0,0 +1,16 @@ +[Unit] +Description=Load legacy module configuration +DefaultDependencies=no +Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionPathExists=|/etc/rc.modules +ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ + +[Service] +ExecStart=/usr/lib/systemd/loadmodules +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/nis-domainname.service b/usr/lib/systemd/system/nis-domainname.service new file mode 100644 index 00000000..3f8412ae --- /dev/null +++ b/usr/lib/systemd/system/nis-domainname.service @@ -0,0 +1,13 @@ +[Unit] +Description=Read and set NIS domainname from /etc/sysconfig/network +Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target +DefaultDependencies=no +Conflicts=shutdown.target + +[Service] +ExecStart=/usr/lib/systemd/nis-domainname +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/usr/lib/systemd/system/readonly-root.service b/usr/lib/systemd/system/readonly-root.service new file mode 100644 index 00000000..83af6acd --- /dev/null +++ b/usr/lib/systemd/system/readonly-root.service @@ -0,0 +1,15 @@ +[Unit] +Description=Configure read-only root support +DefaultDependencies=no +Conflicts=shutdown.target +Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target systemd-random-seed.service +After=systemd-remount-fs.service + +[Service] +ExecStart=/usr/lib/systemd/readonly-root +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=local-fs.target -- cgit v1.2.1 From 1a436be4b16b6eed3f29b192ace8435daaf041f6 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 31 May 2018 12:08:05 +0200 Subject: nis-domainname.service removed It has been moved into the hostname package: https://src.fedoraproject.org/rpms/hostname/pull-request/1 --- usr/lib/systemd/system/nis-domainname.service | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 usr/lib/systemd/system/nis-domainname.service (limited to 'usr/lib/systemd/system') diff --git a/usr/lib/systemd/system/nis-domainname.service b/usr/lib/systemd/system/nis-domainname.service deleted file mode 100644 index 3f8412ae..00000000 --- a/usr/lib/systemd/system/nis-domainname.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Read and set NIS domainname from /etc/sysconfig/network -Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target -DefaultDependencies=no -Conflicts=shutdown.target - -[Service] -ExecStart=/usr/lib/systemd/nis-domainname -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=sysinit.target -- cgit v1.2.1 From ead5bff2561eae45007c8d9e949379c3454c0183 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 12 Jun 2018 16:56:10 +0200 Subject: specfile: services from /usr/lib/systemd moved to /usr/libexec --- usr/lib/systemd/system/import-state.service | 2 +- usr/lib/systemd/system/loadmodules.service | 2 +- usr/lib/systemd/system/readonly-root.service | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'usr/lib/systemd/system') 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 -- cgit v1.2.1 From f5e4588e0e73046ed0995c148e8a4619b9ba69fb Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 12 Jun 2018 17:24:57 +0200 Subject: specfile: netconsole service moved to /usr/libexec --- usr/lib/systemd/system/netconsole.service | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 usr/lib/systemd/system/netconsole.service (limited to 'usr/lib/systemd/system') diff --git a/usr/lib/systemd/system/netconsole.service b/usr/lib/systemd/system/netconsole.service new file mode 100644 index 00000000..29248a4f --- /dev/null +++ b/usr/lib/systemd/system/netconsole.service @@ -0,0 +1,14 @@ +[Unit] +Description=Initializes network console logging of kernel messages +ConditionPathExists=/etc/sysconfig/netconsole +After=network-online.target +Wants=network-online.target + +[Service] +ExecStart=/usr/libexec/netconsole start +ExecStop=/usr/libexec/netconsole stop +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target -- cgit v1.2.1