Accepting request 280821 from home:jengelh:branches:Base:System

- Update to new upstream release 218
I really want networkd with a functioning machinectl --network-veth (broken in 13.2).

OBS-URL: https://build.opensuse.org/request/show/280821
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=844
This commit is contained in:
2015-02-13 09:43:21 +00:00
committed by Git OBS Bridge
parent 9191e858e0
commit f35f0221c2
503 changed files with 2242 additions and 109856 deletions

View File

@@ -6,26 +6,26 @@ Subject: [PATCH] insserv.conf generator
parse /etc/insserv.conf.dd content and /etc/insserv.conf and generate
systemd unit drop-in files to add dependencies
---
Makefile.am | 9 +
src/insserv-generator/Makefile | 28 +++
src/insserv-generator/insserv-generator.c | 309 ++++++++++++++++++++++++++++++
3 files changed, 346 insertions(+)
Makefile.am | 9
src/insserv-generator/Makefile | 28 ++
src/insserv-generator/insserv-generator.c | 312 ++++++++++++++++++++++++++++++
3 files changed, 349 insertions(+)
create mode 100644 src/insserv-generator/Makefile
create mode 100644 src/insserv-generator/insserv-generator.c
Index: systemd-210/Makefile.am
Index: systemd-218/Makefile.am
===================================================================
--- systemd-210.orig/Makefile.am
+++ systemd-210/Makefile.am
@@ -343,6 +343,7 @@ rootlibexec_PROGRAMS = \
systemd-socket-proxyd
--- systemd-218.orig/Makefile.am
+++ systemd-218/Makefile.am
@@ -399,6 +399,7 @@ rootlibexec_PROGRAMS += \
endif
systemgenerator_PROGRAMS = \
+ systemd-insserv-generator \
systemd-getty-generator \
systemd-fstab-generator \
systemd-system-update-generator
@@ -1728,6 +1729,14 @@ systemd_delta_LDADD = \
systemd-system-update-generator \
@@ -2286,6 +2287,14 @@ systemd_delta_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -40,10 +40,10 @@ Index: systemd-210/Makefile.am
systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
Index: systemd-210/src/insserv-generator/Makefile
Index: systemd-218/src/insserv-generator/Makefile
===================================================================
--- /dev/null
+++ systemd-210/src/insserv-generator/Makefile
+++ systemd-218/src/insserv-generator/Makefile
@@ -0,0 +1,28 @@
+# This file is part of systemd.
+#
@@ -73,10 +73,10 @@ Index: systemd-210/src/insserv-generator/Makefile
+ $(MAKE) -C .. clean
+
+.PHONY: all clean
Index: systemd-210/src/insserv-generator/insserv-generator.c
Index: systemd-218/src/insserv-generator/insserv-generator.c
===================================================================
--- /dev/null
+++ systemd-210/src/insserv-generator/insserv-generator.c
+++ systemd-218/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,312 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+