Commit 87eac63e authored by Sjoerd Simons's avatar Sjoerd Simons
Browse files

Merge branch 'master' into experimental

Conflicts:
	debian/changelog
	debian/control
	debian/patches/Add-run-initctl-support-to-SysV-compat-tools.patch
	debian/patches/Add-targets-for-compatibility-with-Debian-insserv-sy.patch
	debian/patches/Also-redirect-to-update-rc.d-when-not-using-.service.patch
	debian/patches/Avoid-reload-and-re-start-requests-during-early-boot.patch
	debian/patches/Avoid-reloading-services-when-shutting-down.patch
	debian/patches/Check-for-kmod-binary.patch
	debian/patches/Don-t-mount-tmp-as-tmpfs-by-default.patch
	debian/patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch
	debian/patches/Revert-udev-network-device-renaming-immediately-give.patch
	debian/patches/Start-logind-on-demand-via-libpam-systemd.patch
	debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch
	debian/patches/Use-different-default-paths-for-various-binaries.patch
	debian/patches/build-sys-don-t-move-libgudev-to-lib.patch
	debian/patches/change-the-log_info-line-in-systemctl-to-reflect-rea.patch
	debian/patches/core-You-can-not-put-the-cached-result-of-use_smack-.patch
	debian/patches/core-snapshot-log-info-when-snapshots-are-created-an.patch
	debian/patches/core-transaction-avoid-misleading-error-message-when.patch
	debian/patches/core-transaction-fix-cycle-break-attempts-outside-tr.patch
	debian/patches/cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch
	debian/patches/ignore-chkconfig-headers-entirely-they-are-often-bro.patch
	debian/patches/insserv.conf-generator.patch
	debian/patches/logind-if-a-user-is-sitting-in-front-of-the-computer.patch
	debian/patches/man-fix-path-in-crypttab-5.patch
	debian/patches/series
	debian/patches/systemctl-call-update-rc.d-enable-disable-not-defaul.patch
	debian/patches/systemctl-don-t-skip-native-units-when-enabling-disa.patch
	debian/patches/units-conditionalize-static-device-node-logic-on-CAP.patch
	debian/patches/util-do-not-strip-dev-prefix-twice.patch
parents c88d78b6 09258517
......@@ -52,11 +52,38 @@ systemd (214-1) UNRELEASED; urgency=medium
-- Sjoerd Simons <sjoerd@debian.org> Sun, 10 Aug 2014 10:42:30 +0200
systemd (208-8) UNRELEASED; urgency=medium
systemd (208-8) unstable; urgency=medium
[ Martin Pitt ]
* Fix duplicate line in copyright. (Closes: #756899)
* Drop --disable-xattr configure option for udeb, does not exist any more.
* Add Turkish debconf translations. Thanks Mert Dirik! (Closes: #757498)
* Backport fix for lazy session-activation on non-seat0 seats.
(LP: #1355331)
-- Martin Pitt <mpitt@debian.org> Thu, 07 Aug 2014 08:31:38 +0200
[ Michael Biebl ]
* Use "kmod static-nodes --output=/proc/self/fd/1" in make_static_nodes() as
we can't rely on /dev/stdout to exist at this point during boot.
(Closes: #757830)
* Fix udev SysV init script and d-i start script to not write to
/sys/kernel/uevent_helper unconditionally to not fail on a kernel with
CONFIG_UEVENT_HELPER unset. (Closes: #756312)
* Add Breaks: kmod (<< 14) to udev to make sure we have a kmod version
supporting the static-nodes command.
* Add Breaks: systemd (<< 208) to udev to avoid partial upgrades. Newer udev
versions rely on kmod-static-nodes.service being provided by systemd.
(Closes: #757777)
* Updated upstream v208-stable patch series to 53b1b6c.
* Cherry-pick upstream fix to ignore temporary dpkg files. (Closes: #757302)
* Make emergency.service conflict with rescue.service.
Otherwise if rescue mode is selected during boot and the emergency mode
is triggered (e.g. via a broken fstab entry), we have two sulogin
processes fighting over the tty. (Closes: #757072)
* Stop syslog.socket when entering emergency mode as otherwise every log
message triggers the start of the syslog service and its dependencies
which conflicts with emergency.target. (Closes: #755581)
-- Michael Biebl <biebl@debian.org> Thu, 21 Aug 2014 00:14:21 +0200
systemd (208-7) unstable; urgency=medium
......
......@@ -287,7 +287,10 @@ Depends: ${shlibs:Depends},
util-linux (>= 2.16),
s390-tools (>> 1.6.2) [s390],
procps
Breaks: consolekit (<< 0.4.6-1), plymouth (<< 0.9.0-7)
Breaks: consolekit (<< 0.4.6-1),
kmod (<< 14),
systemd (<< 208),
plymouth (<< 0.9.0-7)
Description: /dev/ and hotplug management daemon
udev is a daemon which dynamically creates and removes device nodes from
/dev/, handles hotplug events and loads drivers at boot time.
......
......@@ -66,8 +66,3 @@ for program in ata_id scsi_id; do
copy_exec /lib/udev/$program /lib/udev
done
copy_exec /sbin/blkid /sbin
if [ -x /lib/udev/vio_type ]; then
copy_exec /lib/udev/vio_type /lib/udev
fi
#!/bin/sh -e
echo > /sys/kernel/uevent_helper
if [ -w /sys/kernel/uevent_helper ]; then
echo > /sys/kernel/uevent_helper
fi
if ! grep -E -q "^[^[:space:]]+ /dev devtmpfs" /proc/mounts; then
mount -n -o mode=0755 -t devtmpfs devtmpfs /dev
mount -n -o mode=0755 -t devtmpfs devtmpfs /dev
fi
/lib/systemd/systemd-udevd --daemon --resolve-names=never
......
......@@ -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 9c86bcf..1e33415 100644
index cdd412e..0bbd79a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -497,6 +497,12 @@ nodist_systemunit_DATA = \
@@ -465,6 +465,12 @@ nodist_systemunit_DATA = \
units/initrd-switch-root.service \
units/systemd-nspawn@.service
......
From: Michael Biebl <biebl@debian.org>
Date: Sun, 27 Apr 2014 15:41:26 +0200
Subject: Check for kmod binary
Creating the list of dead device nodes requires kmod. Inside containers
this is not strictly required so we don't want a hard dependency on the
kmod package. If the binary does not exist kmod-static-nodes.service
will fail, so add a condition to check if the binary is available.
---
units/kmod-static-nodes.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
index 0934a87..076e316 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no
Before=sysinit.target systemd-tmpfiles-setup-dev.service
ConditionCapability=CAP_SYS_MODULE
ConditionPathExists=/lib/modules/%v/modules.devname
+ConditionFileIsExecutable=@KMOD@
[Service]
Type=oneshot
......@@ -32,10 +32,10 @@ index 12d2c94..f5eee70 100644
getty.target \
systemd-ask-password-wall.path
diff --git a/units/tmp.mount b/units/tmp.mount
index 99a3ba3..3b4d6f8 100644
index 00a0d28..8777171 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -18,3 +18,6 @@ What=tmpfs
@@ -19,3 +19,6 @@ What=tmpfs
Where=/tmp
Type=tmpfs
Options=mode=1777,strictatime
......
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Aug 2014 23:44:36 +0200
Subject: Make emergency.service conflict with rescue.service
Otherwise if rescue mode is selected during boot and the emergency mode
is triggered (e.g. via a broken fstab entry), we have two sulogin
processes fighting over the tty.
Closes: #757072
Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=82778
---
units/emergency.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 91fc1bb..224a434 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -10,6 +10,7 @@ Description=Emergency Shell
Documentation=man:sulogin(8)
DefaultDependencies=no
Conflicts=shutdown.target
+Conflicts=rescue.service
Before=shutdown.target
[Service]
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Aug 2014 23:52:47 +0200
Subject: Stop syslog.socket when entering emergency mode
When rsyslog is installed, the syslog.socket is active when entering
emergency mode. This triggers the start of rsyslog.service along with
its dependencies. Since sysinit.target conflicts with emergency.target,
this breaks the emergency mode.
As a workaround, add a Conflicts=syslog.socket to emergency.service to
make sure the socket is stopped when emergency.service is started.
Note: This issue is specific to v208 and is not reproducible with v214,
so this patch should be dropped again when packaging newer releases.
Closes: #755581
---
units/emergency.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 224a434..950331b 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -11,6 +11,7 @@ Documentation=man:sulogin(8)
DefaultDependencies=no
Conflicts=shutdown.target
Conflicts=rescue.service
+Conflicts=syslog.socket
Before=shutdown.target
[Service]
From bc3d33edd2b227c17ae338bf147067bdfafe299c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Wed, 28 May 2014 17:36:40 +0800
Subject: [PATCH] build-sys: use glibc's xattr support instead of requiring
libattr
Subject: build-sys: use glibc's xattr support instead of requiring libattr
(cherry picked from commit d2edfae0f9bdbecf6a8518e2a5bcf06f470e0d9e)
---
......@@ -90,7 +88,7 @@ index 9605b38..4b0b45b 100644
QRENCODE: ${have_qrencode}
MICROHTTPD: ${have_microhttpd}
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index cff83d3..12b7ed3 100644
index 5c6edfd..6843183 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -87,10 +87,8 @@ static const MountPoint mount_table[] = {
......@@ -105,7 +103,7 @@ index cff83d3..12b7ed3 100644
NULL, MNT_IN_CONTAINER },
{ "pstore", "/sys/fs/pstore", "pstore", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
diff --git a/src/core/socket.c b/src/core/socket.c
index 8e02c03..3bd4532 100644
index 1bf1f05..66af49d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -28,9 +28,7 @@
......@@ -120,7 +118,7 @@ index 8e02c03..3bd4532 100644
#include "unit.h"
#include "socket.h"
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 2d2d289..010dda1 100644
index 2d79dce..dd63803 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -26,10 +26,7 @@
......@@ -135,7 +133,7 @@ index 2d2d289..010dda1 100644
#include "journal-def.h"
#include "journal-file.h"
@@ -2513,7 +2510,6 @@ int journal_file_open(
@@ -2507,7 +2504,6 @@ int journal_file_open(
}
if (f->last_stat.st_size == 0 && f->writable) {
......@@ -143,7 +141,7 @@ index 2d2d289..010dda1 100644
uint64_t crtime;
/* Let's attach the creation time to the journal file,
@@ -2528,7 +2524,6 @@ int journal_file_open(
@@ -2522,7 +2518,6 @@ int journal_file_open(
crtime = htole64((uint64_t) now(CLOCK_REALTIME));
fsetxattr(f->fd, "user.crtime_usec", &crtime, sizeof(crtime), XATTR_CREATE);
......@@ -195,6 +193,3 @@ index 695e518..442120a 100644
}
static int journal_file_empty(int dir_fd, const char *name) {
--
2.0.1
......@@ -4,14 +4,14 @@ Subject: more cd aliases
Add more aliases for CD/DVD devices.
---
rules/60-cdrom_id.rules | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
rules/60-cdrom_id.rules | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: systemd/rules/60-cdrom_id.rules
===================================================================
--- systemd.orig/rules/60-cdrom_id.rules
+++ systemd/rules/60-cdrom_id.rules
@@ -15,6 +15,12 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdr
diff --git a/rules/60-cdrom_id.rules b/rules/60-cdrom_id.rules
index 6eaf76a..4dccfc6 100644
--- a/rules/60-cdrom_id.rules
+++ b/rules/60-cdrom_id.rules
@@ -15,6 +15,12 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdr
# enable the receiving of media eject button events
IMPORT{program}="cdrom_id --lock-media $devnode"
......
......@@ -94,6 +94,7 @@ Set-default-polling-interval-on-removable-devices-as.patch
insserv.conf-generator.patch
Add-targets-for-compatibility-with-Debian-insserv-sy.patch
more-cd-aliases.patch
Check-for-kmod-binary.patch
Adjust-systemd-user-pam-config-file-for-Debian.patch
Add-run-initctl-support-to-SysV-compat-tools.patch
Add-support-for-TuxOnIce-hibernation.patch
......@@ -101,3 +102,5 @@ Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
Do-not-generate-systemd-units-from-sysv-init-scripts.patch
Do-not-order-rcS.d-services-after-local-fs.target-if.patch
Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
Make-emergency.service-conflict-with-rescue.service.patch
Stop-syslog.socket-when-entering-emergency-mode.patch
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Aug 2014 15:32:09 +0200
Subject: util: avoid considering dpkg temporary files relevant for anything
https://bugs.freedesktop.org/show_bug.cgi?id=82453
(cherry picked from commit 0cdfd26ef826f8a595ab7d85ebc37894f4f3d940)
---
src/shared/util.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.c b/src/shared/util.c
index a634b9d..c0476e0 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1492,6 +1492,7 @@ _pure_ static bool ignore_file_allow_backup(const char *filename) {
endswith(filename, ".rpmorig") ||
endswith(filename, ".dpkg-old") ||
endswith(filename, ".dpkg-new") ||
+ endswith(filename, ".dpkg-tmp") ||
endswith(filename, ".swp");
}
# Turkish translation of systemd package
# Copyright (C) 2014 Mert Dirik
# This file is distributed under the same license as the systemd package.
# Mert Dirik <mertdirik@gmail.com>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: systemd 208-6\n"
"Report-Msgid-Bugs-To: udev@packages.debian.org\n"
"POT-Creation-Date: 2010-10-17 00:40+0200\n"
"PO-Revision-Date: 2014-08-01 16:54+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. Type: title
#. Description
#: ../udev.templates:2001
msgid "Upgrading udev"
msgstr "udev yükseltiliyor"
#. Type: error
#. Description
#: ../udev.templates:3001
msgid "Reboot needed after this upgrade"
msgstr "Bu yükseltmeden sonra sistemin yeniden başlatılması gerekmektedir"
#. Type: error
#. Description
#: ../udev.templates:3001
msgid ""
"You are currently upgrading udev using an incompatible kernel version. A "
"compatible version is installed or being installed on the system, but you "
"need to reboot using this new kernel as soon as the upgrade is complete."
msgstr ""
"Şu anda uyumsuz bir çekirdek sürümü kullandığınız halde udev'i "
"yükseltiyorsunuz. Uyumlu bir sürüm sisteminize kurulacak ya da şu an "
"kuruluyor, fakat bu sürümü kullanabilmek için yükseltme işlemi tamamlanır "
"tamamlanmaz sisteminizi yeniden başlatmalısınız."
#. Type: error
#. Description
#: ../udev.templates:3001
msgid ""
"Without a reboot with this new kernel version, the system may become "
"UNUSABLE."
msgstr ""
"Bu yeni çekirdek sürümüne geçmediğiniz süre içinde sisteminiz KULLANILAMAZ "
"durumda olacaktır."
#. Type: error
#. Description
#: ../udev.templates:4001
msgid "The running kernel has incompatible options enabled"
msgstr "Kullanılan çekirdek uyumsuz özellikler taşıyor"
#. Type: error
#. Description
#: ../udev.templates:4001
msgid ""
"The currently running kernel has the CONFIG_SYSFS_DEPRECATED option enabled, "
"which is incompatible with this udev release. If you are using the standard "
"Debian kernel packages and are in the process of upgrading from lenny to "
"squeeze, a compatible kernel package should be installed as part of this "
"upgrade. If you are not using the Debian kernel packages or are not "
"currently upgrading the system, you must take action to ensure your kernel "
"is upgraded before the next reboot."
msgstr ""
"Şu an kullanımda bulunan çekirdek CONFIG_SYSFS_DEPRECATED seçeneğini "
"kullanıyor. Bu seçenek udev'in bu sürümü ile uyumsuzluk göstermektedir. "
"Eğer standart Debian çekirdek paketlerini kullanıyorsanız ve lenny'den "
"squeeze'a yükseltme süreci içindeyseniz uyumlu bir çekirdek paketi sürecin "
"bir parçası olarak sisteminize kurulacaktır. Eğer Debian çekirdek "
"paketlerini kullanmıyorsanız ya da şu an sisteminizi yükseltmiyorsanız, "
"çekirdek sürümünün bilgisayarın bir sonraki açılışından önce "
"yükseltilebilmesi için gereken tedbirleri almanız gerekmektedir."
#. Type: error
#. Description
#: ../udev.templates:4001
msgid ""
"Failing to upgrade to a kernel without CONFIG_SYSFS_DEPRECATED will probably "
"not prevent your system from booting, but will prevent certain udev rules "
"from being applied at boot time. In particular, all block devices will be "
"owned by root:root (instead of root:disk), and network interfaces may be "
"named differently after reboots. This latter issue may be a problem if you "
"are administering the machine remotely."
msgstr ""
"Çekirdeğinizi CONFIG_SYSFS_DEPRECATED özelliğinin olmadığı bir sürüme "
"yükseltmediğiniz takdirde sisteminiz büyük olasılıkla açılacaktır, fakat "
"bazı udev kuralları açılış esnasında uygulanamayacaktır. Özellikle, tüm "
"blok aygıtlarının sahibi root:root olacak (root:disk yerine) ve ağ "
"arayüzleri büyük olasılıkla farklı adlara sahip olacaktır. Ağ arayüzlerinin "
"farklı adlara sahip olması eğer bu makineyi uzaktan yönetiyorsanız sorun "
"oluşturabilir."
#. Type: error
#. Description
#: ../udev.templates:4001
msgid "The upgrade of udev will continue after you acknowledge this message."
msgstr ""
"udev yükseltmesinin devam etmesi için bu iletiyi onaylamanız gerekiyor."
#. Type: boolean
#. Description
#: ../udev.templates:5001
msgid "Proceed with the udev upgrade despite the kernel incompatibility?"
msgstr "Çekirdek sürümü uyumsuz olduğu halde udev yükseltmesi yapılsın mı?"
#. Type: boolean
#. Description
#: ../udev.templates:5001
msgid ""
"You are currently upgrading udev to a version that is not compatible with "
"the currently running kernel."
msgstr "Çekirdek sürümünüzle uyumsuz olduğu halde udev'i yükseltiyorsunuz."
#. Type: boolean
#. Description
#: ../udev.templates:5001
msgid ""
"You MUST install a compatible kernel version (2.6.32 or newer) before "
"upgrading, otherwise the system may become UNUSABLE. Packages with a name "
"starting with \"linux-image-2.6-\" provide a kernel image usable with this "
"new udev version."
msgstr ""
"Yükseltmeden önce uyumlu bir çekirdek sürümünü (2.6.32 ya da daha yeni) "
"yüklemeniz gerekmektedir, aksi takdirde sisteminiz KULLANILAMAZ hale "
"gelecektir. \"linux-image-2.6-\" adıyla başlayan paketler bu udev sürümü ile "
"birlikte kullanılabilir."
#. Type: boolean
#. Description
#: ../udev.templates:5001
msgid ""
"If you choose to upgrade udev nevertheless, you should install a compatible "
"kernel and reboot with that kernel as soon as possible."
msgstr ""
"Yine de udev'i yükseltmek isterseniz, uyumlu bir çekirdeği bir an önce "
"kurmalı ve sistemi yeniden başlatmalısınız."
......@@ -91,7 +91,7 @@ make_static_nodes() {
[ -e /lib/modules/$(uname -r)/modules.devname ] || return 0
[ -x /bin/kmod ] || return 0
/bin/kmod static-nodes --format=tmpfiles | \
/bin/kmod static-nodes --format=tmpfiles --output=/proc/self/fd/1 | \
while read type name mode uid gid age arg; do
[ -e $name ] && continue
case "$type" in
......@@ -173,7 +173,9 @@ case "$1" in
warn_if_interactive
fi
echo > /sys/kernel/uevent_helper
if [ -w /sys/kernel/uevent_helper ]; then
echo > /sys/kernel/uevent_helper
fi
move_udev_database
......
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