pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 728046 from home:fbui:systemd:openSUSE-Factory

Browse Source 
- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be)
  See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for
  details. 
  Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped
  from branch SUSE/v243 while we were rebasing.
  Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as
  this functionality had been deprecated during the previous release
  and now have been dropped by upstream.

- systemd-container creates and owns /etc/systemd/nspawn now

OBS-URL: https://build.opensuse.org/request/show/728046
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1066
This commit is contained in:
Franck Bui 2019-09-03 15:38:17 +00:00 committed by Git OBS Bridge
parent 3c0f3d60ca
commit 80c9a42efc
9 changed files with 76 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

365
0001-Revert-insserv.conf-generator.patch
View File

@ -1,365 +0,0 @@
From e143d8271cd8d8dd862a627754d3daa2d6f9cd48 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 27 May 2019 10:54:26 +0200
Subject: [PATCH] Revert "insserv.conf generator"
This reverts commit dbb7a2e71bec6f6400f2b67cc409b22915fe8c72.
The only (system) packages which were still relying on the insserv-generator
have been fixed, see bsc#1052837 for the details.
[fbui: fixes bsc#1052837]
---
meson.build | 8 -
src/insserv-generator/insserv-generator.c | 320 ----------------------
2 files changed, 328 deletions(-)
delete mode 100644 src/insserv-generator/insserv-generator.c
diff --git a/meson.build b/meson.build
index 54664661b5..4377fe8419 100644
--- a/meson.build
+++ b/meson.build
@@ -2083,14 +2083,6 @@ if conf.get('HAVE_SYSV_COMPAT') == 1
install_rpath : rootlibexecdir,
install : true,
install_dir : systemgeneratordir)
-
- executable('systemd-insserv-generator',
- 'src/insserv-generator/insserv-generator.c',
- include_directories : includes,
- link_with : [libshared],
- install_rpath : rootlibexecdir,
- install : true,
- install_dir : systemgeneratordir)
endif
if conf.get('ENABLE_HOSTNAMED') == 1
diff --git a/src/insserv-generator/insserv-generator.c b/src/insserv-generator/insserv-generator.c
deleted file mode 100644
index 23b5a8255a..0000000000
--- a/src/insserv-generator/insserv-generator.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2012 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include "alloc-util.h"
-#include "mkdir.h"
-#include "log.h"
-#include "fileio.h"
-#include "unit-name.h"
-#include "special.h"
-#include "path-util.h"
-#include "util.h"
-#include "fd-util.h"
-#include "string-util.h"
-#include "strv.h"
-
-static const char *arg_dest = "/tmp";
-
-static char *sysv_translate_name(const char *name) {
- char *r;
-
- r = new(char, strlen(name) + sizeof(".service"));
- if (!r)
- return NULL;
-
- if (endswith(name, ".sh"))
- /* Drop .sh suffix */
- strcpy(stpcpy(r, name) - 3, ".service");
- if (startswith(name, "boot."))
- /* Drop SuSE-style boot. prefix */
- strcpy(stpcpy(r, name + 5), ".service");
- else
- /* Normal init script name */
- strcpy(stpcpy(r, name), ".service");
-
- return r;
-}
-
-static int sysv_translate_facility(const char *name, const char *filename, char **_r) {
-
- /* We silently ignore the $ prefix here. According to the LSB
- * spec it simply indicates whether something is a
- * standardized name or a distribution-specific one. Since we
- * just follow what already exists and do not introduce new
- * uses or names we don't care who introduced a new name. */
-
- static const char * const table[] = {
- /* LSB defined facilities */
- "local_fs", NULL,
- "network", SPECIAL_NETWORK_ONLINE_TARGET,
- "named", SPECIAL_NSS_LOOKUP_TARGET,
- "portmap", SPECIAL_RPCBIND_TARGET,
- "remote_fs", SPECIAL_REMOTE_FS_TARGET,
- "syslog", NULL,
- "time", SPECIAL_TIME_SYNC_TARGET,
- };
-
- unsigned i;
- int e;
- char *r;
- const char *n;
-
- assert(name);
- assert(_r);
-
- n = *name == '$' ? name + 1 : name;
-
- for (i = 0; i < ELEMENTSOF(table); i += 2) {
-
- if (!streq(table[i], n))
- continue;
-
- if (!table[i+1])
- return 0;
-
- r = strdup(table[i+1]);
- if (!r)
- return log_oom();
-
- goto finish;
- }
-
- /* If we don't know this name, fallback heuristics to figure
- * out whether something is a target or a service alias. */
-
- if (*name == '$') {
- if (!unit_prefix_is_valid(n))
- return -EINVAL;
-
- /* Facilities starting with $ are most likely targets */
- e = unit_name_build(n, NULL, ".target", &r);
- if (e < 0)
- return log_error_errno(e, "Failed to generate unit name: %m");
-
- } else if (filename && streq(name, filename))
- /* Names equaling the file name of the services are redundant */
- return 0;
- else
- /* Everything else we assume to be normal service names */
- r = sysv_translate_name(n);
-
- if (!r)
- return -ENOMEM;
-
-finish:
- *_r = r;
-
- return 1;
-}
-
-
-
-static int parse_insserv_conf(const char* filename) {
- _cleanup_fclose_ FILE *f = NULL;
- int r;
-
- if (!(f = fopen(filename, "re"))) {
- log_debug("Failed to open file %s", filename);
- r = errno == ENOENT ? 0 : -errno;
- return r;
- }
-
- while (!feof(f)) {
- char l[LINE_MAX], *t;
- _cleanup_strv_free_ char **parsed = NULL;
-
- if (!fgets(l, sizeof(l), f)) {
- if (feof(f))
- break;
-
- r = -errno;
- log_error("Failed to read configuration file '%s': %s", filename, strerror(-r));
- return -r;
- }
-
- t = strstrip(l);
- if (*t != '$' && *t != '<')
- continue;
-
- parsed = strv_split(t,WHITESPACE);
- /* we ignore <interactive>, not used, equivalent to X-Interactive */
- if (parsed && !startswith_no_case (parsed[0], "<interactive>")) {
- _cleanup_free_ char *facility = NULL;
- if (sysv_translate_facility(parsed[0], NULL, &facility) < 0 || !facility)
- continue;
- if (streq(facility, SPECIAL_REMOTE_FS_TARGET)) {
- _cleanup_free_ char *unit = NULL;
- /* insert also a Wants dependency from remote-fs-pre on remote-fs */
- unit = strjoin(arg_dest, "/remote-fs.target.d/50-",basename(filename),".conf", NULL);
- if (!unit)
- return log_oom();
-
- mkdir_parents_label(unit, 0755);
-
- r = write_string_file(unit,
- "# Automatically generated by systemd-insserv-generator\n\n"
- "[Unit]\n"
- "Wants=remote-fs-pre.target\n", WRITE_STRING_FILE_CREATE);
- if (r)
- return r;
- free (facility);
- facility=strdup(SPECIAL_REMOTE_FS_PRE_TARGET);
- }
- if (facility && endswith(facility, ".target")) {
- char *name, **j;
- FILE *file = NULL;
-
- STRV_FOREACH (j, parsed+1) {
- _cleanup_free_ char *unit = NULL;
- _cleanup_free_ char *dep = NULL;
-
- if (*j[0] == '+')
- name = *j+1;
- else
- name = *j;
- if (streq(name, "boot.localfs") ||
- streq(name, "boot.crypto"))
- continue;
- if ((sysv_translate_facility(name, NULL, &dep) < 0) || !dep)
- continue;
-
- unit = strjoin(arg_dest, "/", dep, ".d/50-",basename(filename),"-",parsed[0],".conf", NULL);
- if (!unit)
- return log_oom();
-
- mkdir_parents_label(unit, 0755);
-
- file = fopen(unit, "wxe");
- if (!file) {
- if (errno == EEXIST)
- log_error("Failed to create drop-in file %s", unit);
- else
- log_error("Failed to create drop-in file %s: %m", unit);
- return -errno;
- }
-
- fprintf(file,
- "# Automatically generated by systemd-insserv-generator\n\n"
- "[Unit]\n"
- "Wants=%s\n"
- "Before=%s\n",
- facility, facility);
-
- fflush(file);
- if (ferror(file)) {
- log_error("Failed to write unit file %s: %m", unit);
- return -errno;
- }
- fclose(file);
-
- if (*j[0] != '+') {
- free (unit);
- unit = strjoin(arg_dest, "/", facility, ".d/50-hard-dependency-",basename(filename),"-",parsed[0],".conf", NULL);
- if (!unit)
- return log_oom();
-
- mkdir_parents_label(unit, 0755);
-
- file = fopen(unit, "wxe");
- if (!file) {
- if (errno == EEXIST)
- log_error("Failed to create drop-in file %s, as it already exists", unit);
- else
- log_error("Failed to create drop-in file %s: %m", unit);
- return -errno;
- }
-
-
- fprintf(file,
- "# Automatically generated by systemd-insserv-generator\n\n"
- "[Unit]\n"
- "SourcePath=%s\n"
- "Requires=%s\n",
- filename, dep);
- fflush(file);
- if (ferror(file)) {
- log_error("Failed to write unit file %s: %m", unit);
- return -errno;
- }
- fclose(file);
- }
- }
- }
- }
- }
- return r;
-}
-
-static int parse_insserv(void) {
- DIR *d = NULL;
- struct dirent *de;
- int r = 0;
-
- if (!(d = opendir("/etc/insserv.conf.d/"))) {
- if (errno != ENOENT) {
- log_debug("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno));
- }
- } else {
-
- while ((de = readdir(d))) {
- char *path = NULL;
- if (hidden_or_backup_file(de->d_name))
- continue;
-
- path = strjoin("/etc/insserv.conf.d/", de->d_name, NULL);
- parse_insserv_conf(path);
- free(path);
- }
- closedir (d);
- }
-
- r = parse_insserv_conf("/etc/insserv.conf");
-
- return r;
-}
-
-int main(int argc, char *argv[]) {
- int r = 0;
-
- if (argc > 1 && argc != 4) {
- log_error("This program takes three or no arguments.");
- return EXIT_FAILURE;
- }
-
- if (argc > 1)
- arg_dest = argv[1];
-
- log_set_prohibit_ipc(true);
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
-
- umask(0022);
-
- r = parse_insserv();
-
- return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
-}
--
2.21.0

31
0001-rc-local-generator-deprecate-halt.local-support.patch
View File

@ -1,31 +0,0 @@
From 5e397db506aa75e50387bdcb6bfd3d4fa7ac92e7 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 27 May 2019 14:50:36 +0200
Subject: [PATCH] rc-local-generator: deprecate halt.local support
Its support will be dropped after systemd v242, see [1]. So let's give users of
this script a chance to replace it nicely.
[1] https://github.com/systemd/systemd/pull/12571
---
src/rc-local-generator/rc-local-generator.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index 7a3948e92d..5699c4f876 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -68,6 +68,10 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
if (check_executable(RC_LOCAL_SCRIPT_PATH_STOP) >= 0) {
log_debug("Automatically adding halt-local.service.");
+ log_warning("Support for %s will be removed soon. "
+ "Please see systemd-shutdown(8) man page for a similar but better alternative.",
+ RC_LOCAL_SCRIPT_PATH_STOP);
+
k = add_symlink("halt-local.service", "final.target");
}
--
2.21.0

17
0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
View File

@ -1,4 +1,4 @@
From 86aa208e639b119007332718aa4f453af2a061d0 Mon Sep 17 00:00:00 2001
From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 11 Mar 2016 17:06:17 -0500
Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime
@ -18,10 +18,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1313085
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index f4efddf8e5..3386e3bf67 100644
index 2ca9fbdc72..3c8a9ff12a 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -45,6 +45,10 @@ static int run(int argc, char *argv[]) {
@@ -49,6 +49,10 @@ static int run(int argc, char *argv[]) {
/* Drop privileges, but only if we have been started as root. If we are not running as root we assume most
* privileges are already dropped. */
if (getuid() == 0) {
@ -33,19 +33,16 @@ index f4efddf8e5..3386e3bf67 100644
/* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */
r = drop_privileges(uid, gid,
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index df8d42101c..928105ea8d 100644
index f82e0b82ce..66a777bdb2 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
m4_ifdef(`HAVE_SMACK_RUN_LABEL',
t /etc/mtab - - - - security.SMACK64=_
)m4_dnl
-m4_ifdef(`ENABLE_RESOLVE',
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
-)m4_dnl
C /etc/nsswitch.conf - - - -
C! /etc/nsswitch.conf - - - -
m4_ifdef(`HAVE_PAM',
C /etc/pam.d - - - -
--
2.19.2
C! /etc/pam.d - - - -

20
systemd-mini.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be)
See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for
details.
Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped
from branch SUSE/v243 while we were rebasing.
Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as
this functionality had been deprecated during the previous release
and now have been dropped by upstream.
-------------------------------------------------------------------
Wed Jul 31 14:38:13 UTC 2019 - Franck Bui <fbui@suse.com>
- systemd-container creates and owns /etc/systemd/nspawn now
-------------------------------------------------------------------
Mon Jul 22 15:29:51 UTC 2019 - Franck Bui <fbui@suse.com>

23
systemd-mini.spec
View File

@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
%define mini -mini
%define min_kernel_version 4.5
%define suse_version +suse.135.g0f9271c133
%define suse_version +suse.32.ge0b24c4356
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -53,7 +53,7 @@
Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 242
Version: 243
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
@ -167,8 +167,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh
# merged by upstream.
Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch
Patch3: 0001-Revert-insserv.conf-generator.patch
Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -449,7 +447,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Ddefault-kill-user-processes=false \
-Dntp-servers="${opensuse_ntp_servers[*]}" \
-Drc-local=/etc/init.d/boot.local \
-Dhalt-local=/etc/init.d/halt.local \
-Ddebug-shell=/bin/bash \
-Dportabled=false \
-Dseccomp=auto \
@ -458,9 +455,12 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dsmack=false \
-Dima=false \
-Delfutils=auto \
-Dpstore=false \
%if ! 0%{?bootstrap}
-Dman=true \
-Dhtml=true \
%endif
%if 0%{?bootstrap}
-Dman=false \
-Dhtml=false \
-Dnss-myhostname=false \
%endif
%if %{without coredump}
@ -528,6 +528,8 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve
install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
%endif
mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn
# Package the scripts used to fix all packaging issues. Also drop the
# "scripts-{systemd/udev}" prefix which is used because osc doesn't
# allow directory structure...
@ -567,6 +569,7 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat
# do not ship sysctl defaults in systemd package, will be part of
# aaa_base (in procps for now)
rm -f %{buildroot}%{_sysctldir}/50-default.conf
rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf
# Make sure systemd-network polkit rules file starts with a suitable
# number prefix so it takes precedence over our polkit-default-privs.
@ -1031,6 +1034,7 @@ fi
%{_systemd_system_env_generator_dir}
%{_systemd_user_env_generator_dir}
%dir %{_ntpunitsdir}
%{_ntpunitsdir}/80-systemd-timesync.list
%dir %{_prefix}/lib/systemd/system-shutdown/
%dir %{_prefix}/lib/systemd/system-sleep/
@ -1099,7 +1103,6 @@ fi
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/system.d
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
@ -1137,8 +1140,6 @@ fi
%exclude %{_datadir}/systemd/gatewayd
%endif
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
@ -1159,6 +1160,7 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%if %{with networkd}
%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
%endif
%if %{with resolved}
@ -1339,6 +1341,7 @@ fi
%files container
%defattr(-,root,root)
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
%if %{with networkd}

3
systemd-v242+suse.135.g0f9271c133.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:383bf8d4d50df8d334449ce7135d4de33e5c386109791914c6e6c4474bd2f5db
size 5325036

3
systemd-v243+suse.32.ge0b24c4356.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7826b55ff3010000ec1b7843eb823a54b30138b1dbc825d7b1a85d9eaa0c56b2
size 5615268

20
systemd.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be)
See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for
details.
Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped
from branch SUSE/v243 while we were rebasing.
Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as
this functionality had been deprecated during the previous release
and now have been dropped by upstream.
-------------------------------------------------------------------
Wed Jul 31 14:38:13 UTC 2019 - Franck Bui <fbui@suse.com>
- systemd-container creates and owns /etc/systemd/nspawn now
-------------------------------------------------------------------
Mon Jul 22 15:29:51 UTC 2019 - Franck Bui <fbui@suse.com>

23
systemd.spec
View File

@ -24,7 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
%define suse_version +suse.135.g0f9271c133
%define suse_version +suse.32.ge0b24c4356
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -51,7 +51,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 242
Version: 243
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
@ -165,8 +165,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh
# merged by upstream.
Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch
Patch3: 0001-Revert-insserv.conf-generator.patch
Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -447,7 +445,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Ddefault-kill-user-processes=false \
-Dntp-servers="${opensuse_ntp_servers[*]}" \
-Drc-local=/etc/init.d/boot.local \
-Dhalt-local=/etc/init.d/halt.local \
-Ddebug-shell=/bin/bash \
-Dportabled=false \
-Dseccomp=auto \
@ -456,9 +453,12 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dsmack=false \
-Dima=false \
-Delfutils=auto \
-Dpstore=false \
%if ! 0%{?bootstrap}
-Dman=true \
-Dhtml=true \
%endif
%if 0%{?bootstrap}
-Dman=false \
-Dhtml=false \
-Dnss-myhostname=false \
%endif
%if %{without coredump}
@ -526,6 +526,8 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve
install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
%endif
mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn
# Package the scripts used to fix all packaging issues. Also drop the
# "scripts-{systemd/udev}" prefix which is used because osc doesn't
# allow directory structure...
@ -565,6 +567,7 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat
# do not ship sysctl defaults in systemd package, will be part of
# aaa_base (in procps for now)
rm -f %{buildroot}%{_sysctldir}/50-default.conf
rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf
# Make sure systemd-network polkit rules file starts with a suitable
# number prefix so it takes precedence over our polkit-default-privs.
@ -1029,6 +1032,7 @@ fi
%{_systemd_system_env_generator_dir}
%{_systemd_user_env_generator_dir}
%dir %{_ntpunitsdir}
%{_ntpunitsdir}/80-systemd-timesync.list
%dir %{_prefix}/lib/systemd/system-shutdown/
%dir %{_prefix}/lib/systemd/system-sleep/
@ -1097,7 +1101,6 @@ fi
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/system.d
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
@ -1135,8 +1138,6 @@ fi
%exclude %{_datadir}/systemd/gatewayd
%endif
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
@ -1157,6 +1158,7 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%if %{with networkd}
%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
%endif
%if %{with resolved}
@ -1337,6 +1339,7 @@ fi
%files container
%defattr(-,root,root)
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
%if %{with networkd}