Accepting request 345072 from home:jengelh:d5

- Update to new upstream release 227+228
tested boot-on-cryptoroot

OBS-URL: https://build.opensuse.org/request/show/345072
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=920
This commit is contained in:
2015-12-02 15:45:15 +00:00
committed by Git OBS Bridge
parent 4a2039e87b
commit 3a9ea8f8a3
32 changed files with 515 additions and 815 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 | 316 ++++++++++++++++++++++++++++++
3 files changed, 352 insertions(+), 1 deletion(-)
src/insserv-generator/insserv-generator.c | 319 ++++++++++++++++++++++++++++++
3 files changed, 355 insertions(+), 1 deletion(-)
create mode 100644 src/insserv-generator/Makefile
create mode 100644 src/insserv-generator/insserv-generator.c
Index: systemd-224/Makefile.am
Index: systemd-228/Makefile.am
===================================================================
--- systemd-224.orig/Makefile.am
+++ systemd-224/Makefile.am
@@ -617,7 +617,8 @@ nodist_systemunit_DATA += \
--- systemd-228.orig/Makefile.am
+++ systemd-228/Makefile.am
@@ -626,7 +626,8 @@ nodist_systemunit_DATA += \
systemgenerator_PROGRAMS += \
systemd-sysv-generator \
@@ -27,7 +27,7 @@ Index: systemd-224/Makefile.am
endif
EXTRA_DIST += \
@@ -2556,6 +2557,12 @@ $(systemd_boot): $(systemd_boot_solib)
@@ -2682,6 +2683,12 @@ $(systemd_boot): $(systemd_boot_solib)
endif
endif
@@ -40,10 +40,10 @@ Index: systemd-224/Makefile.am
# ------------------------------------------------------------------------------
stub_headers = \
src/boot/efi/util.h \
Index: systemd-224/src/insserv-generator/Makefile
Index: systemd-228/src/insserv-generator/Makefile
===================================================================
--- /dev/null
+++ systemd-224/src/insserv-generator/Makefile
+++ systemd-228/src/insserv-generator/Makefile
@@ -0,0 +1,28 @@
+# This file is part of systemd.
+#
@@ -73,11 +73,11 @@ Index: systemd-224/src/insserv-generator/Makefile
+ $(MAKE) -C .. clean
+
+.PHONY: all clean
Index: systemd-224/src/insserv-generator/insserv-generator.c
Index: systemd-228/src/insserv-generator/insserv-generator.c
===================================================================
--- /dev/null
+++ systemd-224/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,316 @@
+++ systemd-228/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,319 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
@@ -112,6 +112,9 @@ Index: systemd-224/src/insserv-generator/insserv-generator.c
+#include "path-util.h"
+#include "util.h"
+#include "strv.h"
+#include "alloc-util.h"
+#include "string-util.h"
+#include "fd-util.h"
+
+static const char *arg_dest = "/tmp";
+