Frederic Crozat
4752019248
- Add rpm macros.systemd file. - Do not disable klogd, it has its own service now. - Handle kexec correctly (bnc#671673). - Disable preload services, they are conflicting with systemd. >>>>>>> .new OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=181
104 lines
3.1 KiB
Diff
104 lines
3.1 KiB
Diff
From 06238c421548f9af6ebebd54eba99bba2a2049d4 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 7 Jul 2011 14:56:30 +0200
|
|
Subject: [PATCH] units: add units for boot.local/halt.local on SUSE distributions.
|
|
|
|
---
|
|
Makefile.am | 19 +++++++++++++++++++
|
|
units/suse/halt-local.service | 20 ++++++++++++++++++++
|
|
units/suse/rc-local.service | 18 ++++++++++++++++++
|
|
3 files changed, 57 insertions(+), 0 deletions(-)
|
|
create mode 100644 units/suse/halt-local.service
|
|
create mode 100644 units/suse/rc-local.service
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 78e5caf..d3265b0 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -436,6 +436,12 @@ dist_systemunit_DATA += \
|
|
units/frugalware/display-manager.service
|
|
endif
|
|
|
|
+if TARGET_SUSE
|
|
+dist_systemunit_DATA += \
|
|
+ units/suse/rc-local.service \
|
|
+ units/suse/halt-local.service
|
|
+endif
|
|
+
|
|
if HAVE_PLYMOUTH
|
|
dist_systemunit_DATA += \
|
|
units/plymouth-start.service \
|
|
@@ -1689,6 +1695,19 @@ if TARGET_DEBIAN_OR_UBUNTU
|
|
$(LN_S) multi-user.target runlevel5.target )
|
|
endif
|
|
|
|
+if TARGET_SUSE
|
|
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
|
|
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
|
|
+ rm -f rc-local.service && \
|
|
+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
|
+ ( cd $(DESTDIR)$(systemunitdir) && \
|
|
+ rm -f local.service && \
|
|
+ $(LN_S) rc-local.service local.service )
|
|
+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
|
|
+ rm -f halt-local.service && \
|
|
+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
|
|
+endif
|
|
+
|
|
if HAVE_SYSV_COMPAT
|
|
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
|
|
rm -f var-lock.mount && \
|
|
diff --git a/units/suse/halt-local.service b/units/suse/halt-local.service
|
|
new file mode 100644
|
|
index 0000000..68cacc6
|
|
--- /dev/null
|
|
+++ b/units/suse/halt-local.service
|
|
@@ -0,0 +1,20 @@
|
|
+# This file is part of systemd.
|
|
+#
|
|
+# systemd is free software; you can redistribute it and/or modify it
|
|
+# under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
+# (at your option) any later version.
|
|
+
|
|
+[Unit]
|
|
+Description=/etc/init.d/halt.local Compatibility
|
|
+ConditionPathExists=/etc/init.d/halt.local
|
|
+DefaultDependencies=no
|
|
+After=shutdown.target
|
|
+Before=final.target
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStart=/etc/init.d/halt.local
|
|
+TimeoutSec=0
|
|
+StandardOutput=tty
|
|
+RemainAfterExit=yes
|
|
diff --git a/units/suse/rc-local.service b/units/suse/rc-local.service
|
|
new file mode 100644
|
|
index 0000000..38884c5
|
|
--- /dev/null
|
|
+++ b/units/suse/rc-local.service
|
|
@@ -0,0 +1,18 @@
|
|
+# This file is part of systemd.
|
|
+#
|
|
+# systemd is free software; you can redistribute it and/or modify it
|
|
+# under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
+# (at your option) any later version.
|
|
+
|
|
+[Unit]
|
|
+Description=/etc/init.d/boot.local Compatibility
|
|
+ConditionPathExists=/etc/init.d/boot.local
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStart=/etc/init.d/boot.local
|
|
+TimeoutSec=0
|
|
+StandardOutput=tty
|
|
+RemainAfterExit=yes
|
|
+SysVStartPriority=99
|
|
--
|
|
1.7.3.4
|
|
|