Commit 35800e13 authored by Michael Biebl's avatar Michael Biebl
Browse files

Update patches

Drop patches which have been applied upstream:
- debian/patches/Fix-CPUShares-configuration-option.patch
- debian/patches/Recognize-discard-option-in-etc-crypttab.patch
- debian/patches/Start-ctrl-alt-del.target-irreversibly.patch
- debian/patches/core-dbus-properly-export-cgroup-properties-on-socke.patch
- debian/patches/initctl-use-irreversible-jobs-when-switching-runleve.patch
- debian/patches/journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
- debian/patches/polkit-Avoid-race-condition-in-scraping-proc.patch
- debian/patches/systemctl-mangle-names-when-avoiding-dbus.patch
- debian/patches/systemd-tmpfiles-setup-dev-remain-after-exit.patch

Drop patches which no longer work after the cgroup rework:
- debian/patches/Clean-up-closing-empty-sessions-when-not-running-und.patch
- debian/patches/Make-sd_login_monitor_new-work-for-logind-without-sy.patch

Drop patch which no longer applies and is supposed to be fixed:
- debian/patches/Avoid-sending-sigterm-to-session-leader.patch
parent 0bca2a25
systemd (208-1) UNRELEASED; urgency=medium
* New upstream release.
* Update patches.
-- Michael Biebl <biebl@debian.org> Sun, 27 Apr 2014 12:59:24 +0200
......
......@@ -13,10 +13,10 @@ This reverts the Debian specific bits from
2 files changed, 39 insertions(+)
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index d7113b9..ac922f1 100644
index 276deb9..b823638 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -117,6 +117,27 @@ int locale_setup(void) {
@@ -120,6 +120,27 @@ int locale_setup(char ***environment) {
log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
}
......@@ -41,11 +41,11 @@ index d7113b9..ac922f1 100644
+ log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
+ }
+
if (!variables[VARIABLE_LANG]) {
variables[VARIABLE_LANG] = strdup("C");
if (!variables[VARIABLE_LANG]) {
add = NULL;
for (i = 0; i < _VARIABLE_MAX; i++) {
char *s;
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index cdb6e5b..c183438 100644
index 525c72e..863adba 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -183,6 +183,12 @@ static int read_data(void) {
......
......@@ -11,10 +11,10 @@ Subject: Add targets for compatibility with Debian insserv system facilities
create mode 100644 units/x-display-manager.target
diff --git a/Makefile.am b/Makefile.am
index 0e6bd17..7026b15 100644
index 1bd4e99..78ae428 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -449,6 +449,12 @@ nodist_systemunit_DATA = \
@@ -457,6 +457,12 @@ nodist_systemunit_DATA = \
units/initrd-switch-root.service \
units/systemd-nspawn@.service
......
......@@ -9,10 +9,10 @@ enable rsyslog.service)
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d70657c..aaad4fa 100644
index f3be0f1..ea36b48 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4042,9 +4042,6 @@ static int enable_sysv_units(char **args) {
@@ -4255,9 +4255,6 @@ static int enable_sysv_units(char **args) {
name = args[f];
......@@ -22,7 +22,7 @@ index d70657c..aaad4fa 100644
if (path_is_absolute(name))
continue;
@@ -4076,7 +4073,8 @@ static int enable_sysv_units(char **args) {
@@ -4289,7 +4286,8 @@ static int enable_sysv_units(char **args) {
goto finish;
}
......
......@@ -16,13 +16,13 @@ Forwarded: no
1 file changed, 1 insertion(+)
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
index 01760ef..c65ea15 100644
index 127da7e..c90cc98 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -3,6 +3,7 @@
ACTION=="remove", GOTO="drivers_end"
DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
+SUBSYSTEM=="cpu", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms"
......
......@@ -9,10 +9,10 @@ Closes: #624599
1 file changed, 15 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
index 3996309..c791103 100644
index c573a72..c56027f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -907,6 +907,21 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
@@ -976,6 +976,21 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
dbus_set_error(e, BUS_ERROR_INVALID_JOB_MODE, "final.target is queued, ignoring %s request for unit %s", job_type_to_string(type), unit->id);
return -EINVAL;
}
......
......@@ -9,10 +9,10 @@ for the patch. Closes: #624599.
1 file changed, 25 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
index 0508628..3996309 100644
index 58dacdc..c573a72 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -874,6 +874,8 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
@@ -943,6 +943,8 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool override, DBusError *e, Job **_ret) {
int r;
Transaction *tr;
......@@ -21,7 +21,7 @@ index 0508628..3996309 100644
assert(m);
assert(type < _JOB_TYPE_MAX);
@@ -885,6 +887,29 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
@@ -954,6 +956,29 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
return -EINVAL;
}
......
From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 30 Jun 2012 08:00:35 +0200
Subject: Avoid sending sigterm to session leader
---
src/login/logind-session.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 662273b..8d7b138 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -642,7 +642,7 @@ static int session_terminate_cgroup(Session *s) {
r = manager_get_session_by_pid(s->manager, s->leader, &t);
if (r > 0 && t == s) {
- kill(s->leader, SIGTERM); /* for normal processes */
+ /*kill(s->leader, SIGTERM); */ /* for normal processes */
kill(s->leader, SIGHUP); /* for shells */
kill(s->leader, SIGCONT); /* in case they are stopped */
}
From: Martin Pitt <martinpitt@gnome.org>
Date: Tue, 12 Mar 2013 16:00:13 +0100
Subject: Clean up closing empty sessions when not running under systemd
In logind's manager_gc(), submit "closing" session to garbage collection, to
clean them up once they are empty. This is usually triggered through
manager_cgroup_notify_empty() from a org.freedesktop.systemd1.Agent.Released
signal, but that doesn't happen when not running under systemd.
---
src/login/logind.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/login/logind.c b/src/login/logind.c
index f415c6b..cee2b9b 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1376,9 +1376,17 @@ void manager_gc(Manager *m, bool drop_not_started) {
Seat *seat;
Session *session;
User *user;
+ Iterator i;
assert(m);
+ /* clean up empty sessions when not running under systemd */
+ if (!sd_booted()) {
+ HASHMAP_FOREACH(session, m->session_cgroups, i)
+ if (session_get_state(session) == SESSION_CLOSING)
+ session_add_to_gc_queue(session);
+ }
+
while ((seat = m->seat_gc_queue)) {
LIST_REMOVE(Seat, gc_queue, m->seat_gc_queue, seat);
seat->in_gc_queue = false;
......@@ -18,11 +18,11 @@ anymore afterwards).
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3a196a6..cabb303 100644
index 8d9c587..7d1f408 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4050,8 +4050,7 @@ SHUTDOWN_TARGET_WANTS += \
systemd-update-utmp-shutdown.service
@@ -4413,8 +4413,7 @@ SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
- systemd-fsck-root.service \
......
......@@ -8,10 +8,10 @@ libgobject and libgmodule are currently installed in /usr/lib.
1 file changed, 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index eb57ea3..48cfba6 100644
index 631bfde..43f1ec6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2353,15 +2353,6 @@ typelibs_DATA = \
@@ -2654,15 +2654,6 @@ typelibs_DATA = \
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
......
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 May 2013 17:34:53 +0000
Subject: Fix CPUShares configuration option
This fixes the error message "Unknown or unsupported cgroup attribute
CPUShares".
---
src/core/cgroup-semantics.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/cgroup-semantics.c b/src/core/cgroup-semantics.c
index 82b02bb..7df9d01 100644
--- a/src/core/cgroup-semantics.c
+++ b/src/core/cgroup-semantics.c
@@ -255,7 +255,7 @@ static int map_blkio(const CGroupSemantics *s, const char *value, char **ret) {
}
static const CGroupSemantics semantics[] = {
- { "cpu", "cpu.shares", "CPUShare", false, parse_cpu_shares, NULL, NULL },
+ { "cpu", "cpu.shares", "CPUShares", false, parse_cpu_shares, NULL, NULL },
{ "memory", "memory.soft_limit_in_bytes", "MemorySoftLimit", false, parse_memory_limit, NULL, NULL },
{ "memory", "memory.limit_in_bytes", "MemoryLimit", false, parse_memory_limit, NULL, NULL },
{ "devices", "devices.allow", "DeviceAllow", true, parse_device, map_device, NULL },
......@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/657948
1 file changed, 1 insertion(+)
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
index 50523e4..01760ef 100644
index 0b22d73..127da7e 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -9,5 +9,6 @@ SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block"
......
......@@ -8,7 +8,7 @@ Subject: Make 99-systemd.rules check for /run/systemd/systemd instead of the
1 file changed, 1 insertion(+)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index d17bdd9..b523b35 100644
index bbb7d0c..152eed1 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -6,6 +6,7 @@
......
......@@ -10,7 +10,7 @@ http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceName
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules
index 15b5bc4..c0f66d1 100644
index c5f1b38..4738e53 100644
--- a/rules/80-net-name-slot.rules
+++ b/rules/80-net-name-slot.rules
@@ -5,7 +5,7 @@ SUBSYSTEM!="net", GOTO="net_name_slot_end"
......
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Sat, 26 Apr 2014 17:04:56 +0200
Subject: Make sd_login_monitor_new() work for logind without systemd
Fix sd_login_monitor_new() to not fail if there is no
/sys/fs/cgroup/systemd/machine; that only exists when running with systemd as
PID 1.
This patch does not apply to and can be dropped for >= 205.
Bug-Ubuntu: https://launchpad.net/bugs/1201180
---
src/login/sd-login.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index d0dc42f..511c18a 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -690,10 +690,13 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
return r;
k = inotify_add_watch(fd, p, IN_MOVED_TO|IN_CREATE|IN_DELETE);
+ /* when running logind without systemd as pid 1, this will fail */
+ /*
if (k < 0) {
close_nointr_nofail(fd);
return -errno;
}
+ */
good = true;
}
......@@ -8,10 +8,10 @@ Subject: Make systemctl enable/disable call update-rc.d for sysv init scripts
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3cca861..a008517 100644
index bb7ada9..a5624a8 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4008,7 +4008,6 @@ static int set_environment(DBusConnection *bus, char **args) {
@@ -4221,7 +4221,6 @@ static int set_environment(DBusConnection *bus, char **args) {
static int enable_sysv_units(char **args) {
int r = 0;
......@@ -19,7 +19,7 @@ index 3cca861..a008517 100644
const char *verb = args[0];
unsigned f = 1, t = 1;
LookupPaths paths = {};
@@ -4017,8 +4016,9 @@ static int enable_sysv_units(char **args) {
@@ -4230,8 +4229,9 @@ static int enable_sysv_units(char **args) {
return 0;
if (!streq(verb, "enable") &&
......@@ -31,7 +31,7 @@ index 3cca861..a008517 100644
return 0;
/* Processes all SysV units, and reshuffles the array so that
@@ -4034,7 +4034,7 @@ static int enable_sysv_units(char **args) {
@@ -4247,7 +4247,7 @@ static int enable_sysv_units(char **args) {
_cleanup_free_ char *p = NULL, *q = NULL;
bool found_native = false, found_sysv;
unsigned c = 1;
......@@ -40,7 +40,7 @@ index 3cca861..a008517 100644
char **k, *l;
int j;
pid_t pid;
@@ -4067,9 +4067,6 @@ static int enable_sysv_units(char **args) {
@@ -4280,9 +4280,6 @@ static int enable_sysv_units(char **args) {
break;
}
......@@ -50,7 +50,7 @@ index 3cca861..a008517 100644
if (!isempty(arg_root))
asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/%s", arg_root, name);
else
@@ -4088,15 +4085,10 @@ static int enable_sysv_units(char **args) {
@@ -4301,15 +4298,10 @@ static int enable_sysv_units(char **args) {
/* Mark this entry, so that we don't try enabling it as native unit */
args[f] = (char*) "";
......@@ -68,7 +68,7 @@ index 3cca861..a008517 100644
argv[c] = NULL;
l = strv_join((char**)argv, " ");
@@ -4162,7 +4154,6 @@ finish:
@@ -4375,7 +4367,6 @@ finish:
args[t] = NULL;
......
......@@ -10,7 +10,7 @@ depends on $local_fs.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/remote-fs.target b/units/remote-fs.target
index 09213e8..a050e4d 100644
index 43ffa5c..655621f 100644
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@ -8,7 +8,7 @@
......@@ -19,6 +19,6 @@ index 09213e8..a050e4d 100644
Documentation=man:systemd.special(7)
-After=remote-fs-pre.target
+After=remote-fs-pre.target local-fs.target
DefaultDependencies=no
Conflicts=shutdown.target
[Install]
WantedBy=multi-user.target
From: Ondrej Balaz <blami@blami.net>
Date: Fri, 9 Aug 2013 17:35:18 +0200
Subject: Recognize discard option in /etc/crypttab.
Signed-off-by: Ondrej Balaz <blami@blami.net>
---
src/cryptsetup/cryptsetup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 347394d..2f7a68a 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -117,7 +117,7 @@ static int parse_one_option(const char *option) {
opt_readonly = true;
else if (streq(option, "verify"))
opt_verify = true;
- else if (streq(option, "allow-discards"))
+ else if (streq(option, "allow-discards") || streq(option, "discard"))
opt_discards = true;
else if (streq(option, "luks"))
opt_type = CRYPT_LUKS1;
......@@ -13,7 +13,7 @@ generator for that, as this would be cleaner. But for now that will do.
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
index 06fa127..2d420c1 100644
index 47587d0..e11c413 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -51,7 +51,8 @@
......@@ -50,7 +50,7 @@ index 06fa127..2d420c1 100644
#endif
static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
@@ -907,6 +913,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
@@ -915,6 +921,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
if ((r = sysv_exec_commands(s, supports_reload)) < 0)
goto finish;
......@@ -64,7 +64,7 @@ index 06fa127..2d420c1 100644
if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) {
/* If there a runlevels configured for this service
@@ -3532,7 +3545,7 @@ static int service_enumerate(Manager *m) {
@@ -3541,7 +3554,7 @@ static int service_enumerate(Manager *m) {
if (de->d_name[0] == 'S') {
......@@ -73,7 +73,7 @@ index 06fa127..2d420c1 100644
SERVICE(service)->sysv_start_priority_from_rcnd =
MAX(a*10 + b, SERVICE(service)->sysv_start_priority_from_rcnd);
@@ -3549,7 +3562,8 @@ static int service_enumerate(Manager *m) {
@@ -3558,7 +3571,8 @@ static int service_enumerate(Manager *m) {
goto finish;
} else if (de->d_name[0] == 'K' &&
......
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