Accepting request 323109 from home:jengelh:d3

- Update to new upstream release 224

OBS-URL: https://build.opensuse.org/request/show/323109
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=892
This commit is contained in:
2015-08-17 20:36:04 +00:00
committed by Git OBS Bridge
parent d9d1ffc8bd
commit 8b1af3c775
9 changed files with 60 additions and 46 deletions

View File

@@ -8,16 +8,16 @@ systemd unit drop-in files to add dependencies
---
Makefile.am | 9
src/insserv-generator/Makefile | 28 ++
src/insserv-generator/insserv-generator.c | 315 ++++++++++++++++++++++++++++++
3 files changed, 351 insertions(+), 1 deletion(-)
src/insserv-generator/insserv-generator.c | 316 ++++++++++++++++++++++++++++++
3 files changed, 352 insertions(+), 1 deletion(-)
create mode 100644 src/insserv-generator/Makefile
create mode 100644 src/insserv-generator/insserv-generator.c
Index: systemd-221/Makefile.am
Index: systemd-224/Makefile.am
===================================================================
--- systemd-221.orig/Makefile.am
+++ systemd-221/Makefile.am
@@ -618,7 +618,8 @@ nodist_systemunit_DATA += \
--- systemd-224.orig/Makefile.am
+++ systemd-224/Makefile.am
@@ -617,7 +617,8 @@ nodist_systemunit_DATA += \
systemgenerator_PROGRAMS += \
systemd-sysv-generator \
@@ -27,7 +27,7 @@ Index: systemd-221/Makefile.am
endif
EXTRA_DIST += \
@@ -2544,6 +2545,12 @@ $(systemd_boot): $(systemd_boot_solib)
@@ -2556,6 +2557,12 @@ $(systemd_boot): $(systemd_boot_solib)
endif
endif
@@ -40,10 +40,10 @@ Index: systemd-221/Makefile.am
# ------------------------------------------------------------------------------
stub_headers = \
src/boot/efi/util.h \
Index: systemd-221/src/insserv-generator/Makefile
Index: systemd-224/src/insserv-generator/Makefile
===================================================================
--- /dev/null
+++ systemd-221/src/insserv-generator/Makefile
+++ systemd-224/src/insserv-generator/Makefile
@@ -0,0 +1,28 @@
+# This file is part of systemd.
+#
@@ -73,11 +73,11 @@ Index: systemd-221/src/insserv-generator/Makefile
+ $(MAKE) -C .. clean
+
+.PHONY: all clean
Index: systemd-221/src/insserv-generator/insserv-generator.c
Index: systemd-224/src/insserv-generator/insserv-generator.c
===================================================================
--- /dev/null
+++ systemd-221/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,315 @@
+++ systemd-224/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,316 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
@@ -253,7 +253,8 @@ Index: systemd-221/src/insserv-generator/insserv-generator.c
+ r = write_string_file(unit,
+ "# Automatically generated by systemd-insserv-generator\n\n"
+ "[Unit]\n"
+ "Wants=remote-fs-pre.target\n");
+ "Wants=remote-fs-pre.target\n",
+ WRITE_STRING_FILE_CREATE);
+ if (r)
+ return r;
+ free (facility);