Commit 6ef318a5 authored by Michael Biebl's avatar Michael Biebl
Browse files

Update insserv-generator and map $x-display-manager to display-manager.service

following the recent change in sysv-generator. This avoids creating
references to a no longer existing x-display-manager.target unit.
parent 4cfcbb10
...@@ -4,6 +4,10 @@ systemd (215-14) UNRELEASED; urgency=medium ...@@ -4,6 +4,10 @@ systemd (215-14) UNRELEASED; urgency=medium
making it a target. Using a target had the downside that multiple display making it a target. Using a target had the downside that multiple display
managers could hook into it at the same time which could lead to several managers could hook into it at the same time which could lead to several
failed start attempts for the non-default display manager. failed start attempts for the non-default display manager.
* Update insserv-generator and map $x-display-manager to
display-manager.service, following the recent change in sysv-generator.
This avoids creating references to a no longer existing
x-display-manager.target unit.
-- Michael Biebl <biebl@debian.org> Sat, 28 Mar 2015 09:27:07 +0100 -- Michael Biebl <biebl@debian.org> Sat, 28 Mar 2015 09:27:07 +0100
......
...@@ -12,13 +12,15 @@ It has the following modifications: ...@@ -12,13 +12,15 @@ It has the following modifications:
- it removes support for boot. and bool.localfs which is a SuSE specific - it removes support for boot. and bool.localfs which is a SuSE specific
extension extension
- it ensures that targets do not start other targets or services - it ensures that targets do not start other targets or services
- maps $x-display-manager to display-manager.service, just like the
sysv-generator
[0] https://build.opensuse.org/package/view_file/openSUSE:Factory/systemd/insserv-generator.patch [0] https://build.opensuse.org/package/view_file/openSUSE:Factory/systemd/insserv-generator.patch
--- ---
Makefile.am | 9 + Makefile.am | 9 +
src/insserv-generator/Makefile | 28 +++ src/insserv-generator/Makefile | 28 +++
src/insserv-generator/insserv-generator.c | 324 ++++++++++++++++++++++++++++++ src/insserv-generator/insserv-generator.c | 326 ++++++++++++++++++++++++++++++
3 files changed, 361 insertions(+) 3 files changed, 363 insertions(+)
create mode 100644 src/insserv-generator/Makefile create mode 100644 src/insserv-generator/Makefile
create mode 100644 src/insserv-generator/insserv-generator.c create mode 100644 src/insserv-generator/insserv-generator.c
...@@ -85,10 +87,10 @@ index 0000000..9d07505 ...@@ -85,10 +87,10 @@ index 0000000..9d07505
+.PHONY: all clean +.PHONY: all clean
diff --git a/src/insserv-generator/insserv-generator.c b/src/insserv-generator/insserv-generator.c diff --git a/src/insserv-generator/insserv-generator.c b/src/insserv-generator/insserv-generator.c
new file mode 100644 new file mode 100644
index 0000000..d86ee29 index 0000000..97a68e7
--- /dev/null --- /dev/null
+++ b/src/insserv-generator/insserv-generator.c +++ b/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,324 @@ @@ -0,0 +1,326 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ +
+/*** +/***
...@@ -160,6 +162,8 @@ index 0000000..d86ee29 ...@@ -160,6 +162,8 @@ index 0000000..d86ee29
+ "remote_fs", SPECIAL_REMOTE_FS_TARGET, + "remote_fs", SPECIAL_REMOTE_FS_TARGET,
+ "syslog", NULL, + "syslog", NULL,
+ "time", SPECIAL_TIME_SYNC_TARGET, + "time", SPECIAL_TIME_SYNC_TARGET,
+ /* Debian defined facilities */
+ "x-display-manager", "display-manager.service",
+ }; + };
+ +
+ unsigned i; + unsigned i;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment