src/core/locale-setup.c | 21 21 + 0 - 0 !
src/timedate/timedated.c | 18 18 + 0 - 0 !
2 files changed, 39 insertions(+)

 add back support for debian specific config files

For now fallback to read the locale settings from /etc/default/locale.

This reverts the Debian specific bits from
46a2911bf2780f616396df5671dd901cc7cb54fd
99f861310d3f05f4e86cb9582a94b891dbb3382b

src/systemctl/systemctl.c | 21 6 + 15 - 0 !
1 file changed, 6 insertions(+), 15 deletions(-)

 make systemctl enable/disable call update-rc.d for sysv init scripts
 (#709780)

src/systemctl/systemctl.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 change the log_info() line in systemctl to reflect reality

src/systemctl/systemctl.c | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

 also redirect to update-rc.d when not using .service

I.e. make systemctl enable rsyslog work (previously, only systemctl
enable rsyslog.service)

src/systemctl/systemctl.c | 6 4 + 2 - 0 !
1 file changed, 4 insertions(+), 2 deletions(-)

 =?utf-8?q?systemctl=3a_don=e2=80=99t_skip_native_units_when_enabl?=
 =?utf-8?q?ing/disabling_sysv_units?=

src/systemctl/systemctl.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 systemctl: call update-rc.d enable|disable, not defaults|remove

src/systemctl/systemctl.c | 47 46 + 1 - 0 !
1 file changed, 46 insertions(+), 1 deletion(-)

 run update-rc.d defaults before update-rc.d <enable|disable>

Closes: #722523

src/systemctl/systemctl.c | 22 11 + 11 - 0 !
1 file changed, 11 insertions(+), 11 deletions(-)

 systemctl: mangle names when avoiding dbus

Unit names were mangled in function enable_unit only when dbus was
used. This patch adds mangling also when the dbus is not in use.

This makes it possible to say e.g.:
   systemctl --root=/path enable cups
without spelling cups.service out in full.

src/systemctl/systemctl.c | 11 7 + 4 - 0 !
1 file changed, 7 insertions(+), 4 deletions(-)

 =?utf-8?q?fix_systemctl_enable/disable/=e2=80=a6_error_message_?=
 =?utf-8?q?=E2=80=9CFailed_to_issue_method_call=3A?=
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

No such file or directory

The bug affected only non-native services, i.e. LSB SysV init scripts,
with isc-dhcp-server.service being an example for this commit message.

The bug was introduced with commit
fdcb1bce7b16f69c4d63451816e2c7f824d090b4. The issue is that
enable_unit() would not return even though the SysV init script was
disabled by enable_sysv_units(). enable_unit() then tried to
disable a native systemd unit called isc-dhcp-server.service, even
though there is no such native unit. This is what caused the no such
file or directory error message.

Closes: #734809

src/login/logind.c | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 =?utf-8?q?don=e2=80=99t_try_to_start_autovt_units_when_not_runnin?=
 =?utf-8?q?g_with_systemd_as_pid_1?=

Closes: #726466

src/timedate/timedated.c | 90 89 + 1 - 0 !
1 file changed, 89 insertions(+), 1 deletion(-)

 =?utf-8?q?timedated=3a_don=e2=80=99t_rely_on_/usr_being_mounted_i?=
 =?utf-8?q?n_the_initrd?=
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

This reverts commit 92c4ef2d357baeef78b6f82f119b92f7ed12ac77

We dont have /usr mounted in the initramfs yet in Debian, so lets
support split usr by copying the file instead of symlinking if
necessary, for now.

Closes: #726256

src/fstab-generator/fstab-generator.c | 4 1 + 3 - 0 !
1 file changed, 1 insertion(+), 3 deletions(-)

 =?utf-8?q?fstab-generator=3a_don=e2=80=99t_rely_on_/usr_being_mou?=
 =?utf-8?q?nted_in_the_initrd?=
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Debian is not there yet. Lets revert this upstream change for now.

Closes: #724797

man/systemd-inhibit.xml | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 man: fix reference in systemd-inhibit(1)

http://bugs.debian.org/738316

man/systemd-inhibit.xml | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix remaining reference to systemd-logind.conf

src/login/logind.c | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 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/hostname/org.freedesktop.hostname1.service | 2 1 + 1 - 0 !
src/locale/org.freedesktop.locale1.service | 2 1 + 1 - 0 !
src/login/org.freedesktop.login1.service | 2 1 + 1 - 0 !
src/timedate/org.freedesktop.timedate1.service | 2 1 + 1 - 0 !
4 files changed, 4 insertions(+), 4 deletions(-)

 make logind/hostnamed/localed/timedated d-bus activatable

We want to use those services outside of systemd, so we make them
activatable via D-Bus.

src/login/org.freedesktop.login1.service | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 launch logind via a shell wrapper

We need to setup the cgroupfs mount and the runtime directory before
starting logind. Use a shell script which is triggered by the D-Bus
service.

src/login/pam-module.c | 7 2 + 5 - 0 !
1 file changed, 2 insertions(+), 5 deletions(-)

 start logind on demand via libpam-systemd

Don't make pam_sm_open_session() a NOP if logind is not running. Trying
to access logind via D-Bus will start it on demand.

src/locale/localed.c | 219 112 + 107 - 0 !
1 file changed, 112 insertions(+), 107 deletions(-)

 update localed to use the debian config files

Prefer /etc/default/locale over /etc/locale.conf when writing the locale
configuration and use /etc/default/keyboard instead of
/etc/X11/xorg.conf.d/00-keyboard.conf.

Path courtesy of Steve Langasek.

src/initctl/initctl.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 initctl: use irreversible jobs when switching runlevels

Spotted by uau in #systemd.

src/core/manager.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 start ctrl-alt-del.target irreversibly

This makes ctrl-alt-del reboots more robust, just like "systemctl
reboot".

src/cryptsetup/cryptsetup.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 recognize discard option in /etc/crypttab.

Signed-off-by: Ondrej Balaz <blami@blami.net>

src/shared/polkit.c | 31 5 + 26 - 0 !
1 file changed, 5 insertions(+), 26 deletions(-)

 polkit: avoid race condition in scraping /proc

If a calling process execve()s a setuid program, it can appear to be
uid 0.  Since we're receiving requests over DBus, avoid this by simply
passing system-bus-name as a subject.

src/journal/journald-server.c | 6 4 + 2 - 0 !
src/shared/acl-util.c | 28 28 + 0 - 0 !
src/shared/acl-util.h | 1 1 + 0 - 0 !
3 files changed, 33 insertions(+), 2 deletions(-)

 journald: do recalculate the acl mask, but only if it doesn't exist

Since 11ec7ce, journald isn't setting the ACLs properly anymore if
the files had no ACLs to begin with: acl_set_fd fails with EINVAL.

An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
invalid, so make sure a mask exists before trying to set the ACL.

src/login/logind-session.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 avoid sending sigterm to session leader

src/udev/udev.conf | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 add note to udev.conf that changes to that file require a rebuild of
 the initramfs

Based on debian/patches/udev_conf_comments from the old udev package.

tmpfiles.d/tmp.conf | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 bring tmpfiles.d/tmp.conf in line with debian defaults

Closes: #675422

Makefile.am | 3 1 + 2 - 0 !
units/tmp.mount | 3 3 + 0 - 0 !
2 files changed, 4 insertions(+), 2 deletions(-)

 =?utf-8?q?don=e2=80=99t_mount_/tmp_as_tmpfs_by_default?=
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

by adding an [Install] section to tmp.mount and removing the
local-fs.target.wants symlink.

Users can use systemctl enable tmp.mount to enable mounting /tmp after
the next reboot and systemctl start tmp.mount to get /tmp mounted as
tmpfs right now (beware, files currently in /tmp will not be visible
anymore afterwards).

tmpfiles.d/legacy.conf | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix up tmpfiles.d permissions properly

src/udev/udev-event.c | 44 41 + 3 - 0 !
1 file changed, 41 insertions(+), 3 deletions(-)

 revert "udev: network device renaming - immediately give up if the
 target name isn't available"

This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.

Since we are keeping the old persistent network interface naming for
now, and make the new naming scheme [1] explictly opt-in [2], re-apply
this old hack to make the renaming less likely to fail.

[1] http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
[2] d5051f7666e25ecf2b32c7076ce18c1de969d01b

units/systemd-tmpfiles-setup-dev.service.in | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 systemd-tmpfiles-setup-dev: remain after exit

Without this, tmpfiles-setpu-dev  would be re-run if any other service,
which pulls in basic.target, was started after setup-dev was finished
and before basic.target was active.

Makefile.am | 2 1 + 1 - 0 !
man/udevadm.xml | 6 3 + 3 - 0 !
src/libudev/libudev-hwdb.c | 10 5 + 5 - 0 !
src/udev/udevadm-hwdb.c | 2 1 + 1 - 0 !
4 files changed, 10 insertions(+), 10 deletions(-)

 udev hwdb: store binary database in libdir, not in /etc

Storing huge binary files in /etc/ is ugly, as this is neither user-editable
nor configuration of any kind. This is just a cache file, and does not need
backing up.

Move it to udevlibexecdir instead.

src/core/mount.c | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 systemd: order remote mounts from mountinfo before remote-fs.target

Usually the network is stopped before filesystems are umounted.
Ordering network filesystems before remote-fs.target means that their
unmounting will be performed earlier, and can terminate sucessfully.

https://bugs.freedesktop.org/show_bug.cgi?id=70002

src/core/dbus-socket.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 core/dbus: properly export cgroup properties on sockets

https://bugs.freedesktop.org/show_bug.cgi?id=65945

src/core/cgroup-semantics.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix cpushares configuration option

This fixes the error message "Unknown or unsupported cgroup attribute
CPUShares".

rules/99-systemd.rules.in | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 make 99-systemd.rules check for /run/systemd/systemd instead of the
 ill-named cgroups directory.

rules/80-net-name-slot.rules | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make net.ifnames opt-in instead of opt-out

With this commit, you need to actively specify net.ifnames=1 to get
predictable network interface names:
http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/

Makefile.am | 9 0 + 9 - 0 !
1 file changed, 9 deletions(-)

 don't move libgudev to /lib

libgobject and libgmodule are currently installed in /usr/lib.

configure.ac | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 use different default paths for various binaries

Since Debian hasn't done the usr-merge (yet), various binaries are still
installed in / and not /usr.
Update the defaults in configure.ac so we don't have to build-depend on
quota, libcap2-bin, procps, kmod and kexec-tools just to get the correct
paths.  Closes: #721347

src/login/pam-module.c | 21 18 + 3 - 0 !
1 file changed, 18 insertions(+), 3 deletions(-)

 [patch] pam: check $xdg_runtime_dir owner

http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html requires
that $XDG_RUNTIME_DIR "MUST be owned by the user, and he MUST be the only one
having read and write access to it.".

Don't set an existing $XDG_RUNTIME_DIR in the PAM module if it isn't owned by

man/systemd.mount.xml | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 use comment=systemd.* syntax in systemd.mount man page

The mount/util-linux version in wheezy is not recent enough to support
the new x-systemd* syntax. It requires util-linux 2.21 or newer with the
--enable-new-mount option enabled.

Once we have such a version in Debian, this commit should be reverted
again.

src/core/manager.c | 25 25 + 0 - 0 !
1 file changed, 25 insertions(+)

 avoid reloading services when shutting down

Doing so won't work and makes no sense.  Thanks to Michael Stapelberg
for the patch.  Closes: #624599.

src/core/manager.c | 15 15 + 0 - 0 !
1 file changed, 15 insertions(+)

 avoid reload and (re)start requests during early boot which can lead
 to deadlocks

Closes: #624599

Makefile.am | 1 1 + 0 - 0 !
man/systemd.special.xml | 35 35 + 0 - 0 !
src/core/service.c | 16 9 + 7 - 0 !
src/core/special.h | 3 2 + 1 - 0 !
units/syslog.socket | 5 4 + 1 - 0 !
units/syslog.target | 19 19 + 0 - 0 !
units/systemd-journald.socket | 2 1 + 1 - 0 !
7 files changed, 71 insertions(+), 10 deletions(-)

 revert "service: ignore dependencies on $syslog and $local_fs in lsb
 scripts"

This reverts commit 5d4caf565471ff3401bd9b53aa814c8545a18a93.

Since we added back support for rcS style services, we re-add support for
$local_fs, too.

src/core/service.c | 22 18 + 4 - 0 !
1 file changed, 18 insertions(+), 4 deletions(-)

 revert "service: drop support for sysv scripts for the early boot"

This reverts the Debian specific bits from commit
3cdebc217c42c8529086f2965319b6a48eaaeabe.

We still have 100+ packages shipping SysV init scripts in rcS so it's
too early to drop support for that. We eventually might use a separate
generator for that, as this would be cleaner. But for now that will do.

src/core/service.c | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 ignore chkconfig headers entirely, they are often broken in debian

Closes: #634472

units/remote-fs.target | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 order remote-fs.target after local-fs.target

This change was part of the old debianisation branch created by Tollef
and reflects the fact that on Debian the $remote_fs system facility
depends on $local_fs.

rules/80-drivers.rules | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 load sg module from 80-drivers.rules

rules/50-udev-default.rules | 14 13 + 1 - 0 !
1 file changed, 13 insertions(+), 1 deletion(-)

 updates to default device permissions

rules/60-persistent-storage.rules | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 set default polling interval on removable devices as well

The events_dfl_poll_msecs rule will not trigger if "block" is not a module, but
built in. This will avoid udisks etc. having to poll from userspace, and
provide proper ejection when the hardware eject button is pressed.

Bug-Debian: https://bugs.debian.org/713877
Bug-Ubuntu: https://launchpad.net/bugs/890592

src/login/sd-login.c | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 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/org.freedesktop.login1.policy.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 logind: if a user is sitting in front of the computer and can
 shutdown the machine anyway he should also be able to reboot it

Makefile.am | 9 9 + 0 - 0 !
src/insserv-generator/Makefile | 28 28 + 0 - 0 !
src/insserv-generator/insserv-generator.c | 324 324 + 0 - 0 !
3 files changed, 361 insertions(+)

 insserv.conf generator

Parse /etc/insserv.conf.d content and /etc/insserv.conf and generate
systemd unit drop-in files to add corresponding dependencies.

This patch is based on work by Frederic Crozat <fcrozat@suse.com>.
See [0] for the original patch.

It has the following modifications:
- it removes support for boot. and bool.localfs which is a SuSE specific
  extension
- it ensures that targets do not start other targets or services

[0] https://build.opensuse.org/package/view_file/openSUSE:Factory/systemd/insserv-generator.patch

Makefile.am | 6 6 + 0 - 0 !
units/mail-transport-agent.target | 12 12 + 0 - 0 !
units/x-display-manager.target | 12 12 + 0 - 0 !
3 files changed, 30 insertions(+)

 add targets for compatibility with debian insserv system facilities

rules/60-cdrom_id.rules | 10 9 + 1 - 0 !
1 file changed, 9 insertions(+), 1 deletion(-)

 more cd aliases

Add more aliases for CD/DVD devices.

rules/80-drivers.rules | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 rules: drivers - always call kmod,
 even when a driver is bound to the device

On Sat, Jul 20, 2013 at 12:56 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> After a recent change present in 3.11-rc1 there is a driver, called processor,
> that can be bound to the CPU devices whose sysfs directories are located under
> /sys/devices/system/cpu/.  A side effect of this is that, after the driver has
> been bound to those devices, the kernel adds DRIVER=processor to ENV for CPU
> uevents and they don't match the default rule for autoloading modules matching
> MODALIAS:
>
> DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
>
> any more.  However, there are some modules whose module aliases match specific
> CPU features through the modalias string and those modules should be loaded
> automatically if a compatible CPU is present.  Yet, with the processor driver
> bound to the CPU devices the above rule is not sufficient for that, so we need
> a new default udev rule allowing those modules to be autoloaded even if the
> CPU devices have drivers.

src/shared/fileio.c | 34 34 + 0 - 0 !
src/shared/fileio.h | 2 2 + 0 - 0 !
src/shared/sleep-config.c | 126 107 + 19 - 0 !
src/test/test-fileio.c | 24 24 + 0 - 0 !
4 files changed, 167 insertions(+), 19 deletions(-)

 advertise hibernation only if there's enough free swap

Cherry-pick various upstream patches starting from 69ab80881 and 442e00839
to check whether there is swap available for hibernation.

Bug-Ubuntu: https://launchpad.net/bugs/1313522

src/journal/journald-server.c | 9 1 + 8 - 0 !
1 file changed, 1 insertion(+), 8 deletions(-)

 journal: handle multiline syslog messages
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Since the journal can handle multiple lines just well natively,
and rsyslog can be configured to handle them as well, there is no need
to truncate messages from syslog() after the first newline.

Reproducer:

1. Add following four lines to /etc/rsyslog.conf

   

src/libudev/libudev-enumerate.c | 14 9 + 5 - 0 !
1 file changed, 9 insertions(+), 5 deletions(-)

 libudev: fix memleak when enumerating childs

We need to free udev-devices again if they don't match. Funny that no-one
noticed it yet since valgrind is quite verbose about it.
Fix it and free non-matching devices.

src/systemctl/systemctl.c | 17 11 + 6 - 0 !
1 file changed, 11 insertions(+), 6 deletions(-)

 add /run/initctl support to sysv compat tools

sysvinit in Debian uses /run/initctl as FIFO to communicate with PID 1.
Make the SysV compat tools in systemd-sysv try both /run/initctl and the
traditional /dev/initctl. This makes them usable when running sysvinit
as PID 1.