Last commit made on 2016-04-12
Get this branch:
git clone -b ubuntu/xenial https://git.launchpad.net/ubuntu/+source/systemd
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

ad333bd... by Martin Pitt on 2016-04-12

Import patches-unapplied version 229-4ubuntu4 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 06b2dee24ca4d8daf26e5e96db8be0356a52aec9

New changelog entries:
  * 73-special-net-names.rules: Further refine ibmveth naming.

06b2dee... by Martin Pitt on 2016-04-12

Import patches-unapplied version 229-4ubuntu3 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 88bfda8fc0788e869ac9305527dc029a9aba231f

New changelog entries:
  * debian/tests/cmdline-upstart-boot: In test_rsyslog(), check for messages
    from dbus instead of NetworkManager. NM 1.2 does not seem to log to syslog
    by default any more.
  * 73-special-net-names.rules: Refine ibmveth naming.

88bfda8... by Martin Pitt on 2016-04-12

Import patches-unapplied version 229-4ubuntu2 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 5fb99e37c4fe63974dea2a137b00d0b10496a145

New changelog entries:
  * debian/tests/unit-config: Call "daemon-reload" to clean up generated units
    in between tests.
  * debian/tests/unit-config: Check that enable/disable commands are
  * debian/tests/unit-config: Detect if system units are in /usr/, so that the
    test works on systems with merged /usr.
  * debian/tests/unit-config: Use systemd-sysv-install instead of update-rc.d
    directly, so that the test works under Fedora too.
  * debian/tests/unit-config: Check disabling of a "systemctl link"ed unit,
    and check "systemctl enable" on a unit with full path which is not in the
    standard directories.
  * Rename debian/extra/rules/73-idrac.rules to 73-special-net-names.rules, as
    it is going to get rules for other devices. Also install it into the
  * debian/extra/rules/73-special-net-names.rules: Add DEVPATH number based
    naming schema for ibmveth devices. (LP: #1561096)
    devices with "change" events, as this causes spurious unmounting with
    multipath devices. (LP: #1565969)
  * Fix bogus "No [Install] section" warning when enabling a unit with full
    path. (LP: #1563590)

5fb99e3... by Martin Pitt on 2016-04-07

Import patches-unapplied version 229-4ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 44b5a4955448e3ddb2c52a970205f21460fb085c

New changelog entries:
  * Merge with Debian unstable. Remaining Ubuntu changes:
    - Hack to support system-image read-only /etc, and modify files in
      /etc/writable/ instead.
    Upgrade fixes, keep until 16.04 LTS release:
    - systemd Conflicts/Replaces/Provides systemd-services.
    - Remove obsolete systemd-logind upstart job.
    - Clean up obsolete /etc/udev/rules.d/README.
    - systemd.postinst: Migrate mountall specific fstab options to standard
      util-linux "nofail" option.
    - systemctl: Don't forward telinit u to upstart. This works around
      upstart's Restart() always reexec'ing /sbin/init on Restart(), even if
      that changes to point to systemd during the upgrade. This avoids running
      systemd during a dist-upgrade. (LP: #1430479)
    - Provide shutdown fallback for upstart. (LP: #1370329)
    - Break lvm (<< 2.02.133-1ubuntu1) and remove our dummy /etc/init.d/lvm2
      on upgrades, as it's shipped by lvm2 now.
    - Make udev break on mdadm << 3.3-2ubuntu3, as udev's init script dropped
      the "Provides: raid-mdadm".
    - Clean up /var/log/udev on upgrade (which is written under upstart, but
      not under systemd). (LP: #1537211)
    - Migrate existing s390x network configuration to new names. (LP: #1526808)
    - systemd.postinst: Bump Version comparison for migrating the UTC setting
      from /etc/default/rcS to /etc/adjtime, to run it for upgrades to 16.04.
    - VMWare BIOS reports implausibly high onboard numbers. This got fixed in
      upstream commit 6c1e69f9. Migrate names in ifupdown accordingly.
      (LP: #1550539)
    - udev: Don't kill peer processes if we don't run in a cgroup. This happens
      when running under/upgrading from upstart. udevd and everything else run
      in the root hierarchy on all controllers then, and the alleged cleanup of
      "our" cgroup becomes a system-wide killing spree. (LP: #1555237)

44b5a49... by Martin Pitt on 2016-04-07

Import patches-unapplied version 229-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: dc49cb0a92065959266a2c3ca2d5e06b8f04aa4e

New changelog entries:
  * Fix assertion crash when processing a (broken) device without a sysfs
    path. (Closes: #819290, LP: #1560695)
  * Fix crash when shutdown is issued from a non-tty. (LP: #1553040)
  * networkd: Stay running while any non-loopback interface is up.
    (Closes: #819414)
  * Fix reading uint32 D-Bus properties on big-endian.
  * Fix crash if an udev device has many tags or devlinks. (LP: #1564976)
  * systemctl, loginctl, etc.: Don't start polkit agent when running as root.
    (LP: #1565617)
  * keymap: Add Add HP ZBook (LP: #1535219) and HP ProBook 440 G3.
  * systemd.resource-control.5: Fix links to cgroup documentation on
    kernel.org. (Closes: #819970)
  * Install test-udev into libudev-dev, so that we have it available for
  * Add "udev" autopkgtest for running the upstream test/udev-test.pl.

dc49cb0... by Martin Pitt on 2016-03-21

Import patches-unapplied version 229-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ed04fd7d79d603db969b0eca6f5245906b4f73e4

New changelog entries:
  [ Martin Pitt ]
  * debian/tests/timedated: Add tests for "timedatectl set-local-rtc".
  * Be more tolerant in parsing /etc/adjtime.
  * debian/systemd.postinst: Don't fail package installation if systemctl
    daemon-reload trigger fails. This does not fix the root cause of the
    reload failures, but at least causes fewer packages to be in a broken
    state after upgrade, so that a reboot or apt-get -f install have a much
    higher chance in succeeding. (For bugs like LP #1502097 or LP #1447654)
  * debian/tests/networkd: Skip test_hogplug_dhcp_ip6 when running against
    upstream as well.
  * debian/tests/boot-and-services: Wait for units to stop with a "systemctl
    is-active" loop instead of static sleeps.
  * debian/tests/networkd: Skip DHCPv6 tests for downstream packages too. This
    is an actual regression in networkd-229, to be investigated. But this
    shouldn't hold up reverse dependencies.
  * Fix assertion in add_random(). (LP: #1554861)
  * debian/tests/boot-and-services: Don't assert on "Stopped Container c1"
    message in NspawnTests.test_service(), this is sometimes not present. Just
    check that the unit did not fail.
  * Add "adduser" dependency to systemd-coredump, to quiesce lintian.
  * Bump Standards-Version to 3.9.7 (no changes necessary).
  * Fix timespec parsing by correctly initializing microseconds.
    (Closes: #818698, LP: #1559038)
  * networkd: Add fallback if FIONREAD is not supported. (Closes: #818488)
  * Cherry-pick various fixes from upstream master.
    - Fixes logout when changing the current target. (Closes: #805442)
  [ Evgeny Vereshchagin ]
  * debian/tests/boot-and-services: Search systemd-coredump's output by
  * Add missing "Recommends: btrfs-tools" to systemd-container.
  * Add systemd-coredump postinst/prerm to start/stop systemd-coredump.socket
    without a reboot. (Closes: #816767)
  [ Felipe Sateler ]
  * Set the paths of loadkeys and setfont via configure arguments, not a patch

ed04fd7... by Martin Pitt on 2016-02-28

Import patches-unapplied version 229-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 272601a0862895058b4315413aa0c22485f729ca

New changelog entries:
  * time-util: map ALARM clockids to non-ALARM clockids in now(), to work on
    architectures which don't support CLOCK_BOOTTIME_ALARM. Fixes FTBFS on
    many architectures.
  * debian/systemd.postinst: Add missing newline to /etc/adjtime migration.
    (See #699554)
  * debian/systemd.postinst: Only try to enable tmp.mount if we actually
    copied it to /etc. Don't try to enable a generated unit. (LP: #1545707)
  * debian/tests/boot-and-services: Increase timeouts of test_bash_crash from
    5 to 10 seconds, and sync the journal after every iteration.
  * debian/extra/checkout-upstream: Try again after one minute if git checkout
    fails, to avoid failures from transient network errors.
  * debian/tests/systemd-fsckd: Use grub.d/50-cloudimg-settings.cfg as a
    template for generating our custom one instead of 90-autopkgtest.cfg. The
    latter does not exist on non-x86 architectures and is not relevant for
    this test.
  * debian/tests/boot-and-services: Skip journal test for test_bash_crash when
    running against upstream, as this currently fails most of the time. To be
  * debian/tests/networkd: Skip test_coldplug_dhcp_ip6 when running against
    upstream, as this is brittle there. To be investigated.
  * debian/tests/bootchart: Skip test if bootchart is not available or
    testing in upstream mode. bootchart got removed from master and will be
    moved to a separate repository.
  * debian/tests/boot-and-services: Show verbose journal output on failure in
    nspawn test, and sync journal before.
  * Move systemd-coredump socket and service into systemd-coredump binary
  * Revert changing the default core dump ulimit and core_pattern. This
    completely breaks core dumps without systemd-coredump. It's also
    contradicting core(8). (Closes: #815020)
  * Fix addresses for type "sit" tunnels. (Closes: #816132)
  * networkd: Go back to letting the kernel handle IPv6 router advertisements,
    as networkd's own currently has too many regressions. Thanks to Stefan
    Lippers-Hollmann for investigating this! (Closes: #814566,
    #814667, #815586, #815884, #815793)

272601a... by Martin Pitt on 2016-02-11

Import patches-unapplied version 229-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 1cf7bcab12eb0fc31c92f10c41a4683393686038

New changelog entries:
  * New upstream release 229.
    - Fix systemctl behaviour in chroots. (Closes: #802780)
    - Fix SELinux context of /run/user/$UID. (Closes: #775651)
    - Add option to optionally turn of color output. (Closes: #783692)
    - Don't git-ignore src/journal-remote/browse.html. (Closes: #805514)
    - Do not warn about Wants depencencies on masked units. (LP: #1543282)
  * debian/systemd.install: Ship the new systemd-resolve.
  * libsystemd0.symbols: Add new symbols from this release.
  * systemd-coredump.postinst: Create systemd-coredump system user.
  * debian/tests/systemd-fsckd: Tame overly strict test for failed plymouth
    unit, which is a race condition with plymouthd auto-stopping.
    (LP: #1543144)
  * Drop timedated-don-t-rely-on-usr-being-mounted-in-the-ini.patch.
    initramfs-tools has mounted /usr since Jessie, and tzdata now creates
    /etc/localtime as a symlink too (see #803144).
  * Use-different-default-paths-for-various-binaries.patch: Drop path changes
    for setcap (which is already a build dep and not used at all) and sulogin
    (which is now in util-linux).
  * Remove obsolete udev maintainer script checks:
    - Drop check for kernel >= 2.6.32, which released in 2009.
    - Drop restarting of some daemons due to the devtmpfs migration, which
      happened before the above kernel even.
    - Drop support for forcing upgrades on kernels known not to work via
      /etc/udev/kernel-upgrade. Don't pretend that this would help, as users
      could end up with a non-bootable system. Always fail early in preinst
      when it's still possible to install a working kernel.
    - Drop postinst test for "running in containers" -- it's actually possible
      to run udev in containers if you mount /sys r/w and you know what you
      are doing. Also, the init.d script and systemd service do that check
    - Keep the kernel feature and chroot checks, as these are still useful.
      Simplify check_kernel_features() by eliminating some variables.
    - Drop debconf templates. Two of them are obsolete, and having
      CONFIG_SYSFS_DEPRECATED is now so implausible that this doesn't warrant
      the overhead and translator efforts.
  * Drop debian/tests/ifupdown-hotplug. The units moved into ifupdown, so the
    test should go there too (see #814312).
  * debian/tests/control: Reorder tests and add a comment which ones should
    not be run for an upstream build.
  * debian/tests/control: Rearrange tests and avoid removing test dependencies
    to minimize testbed resets.
  * Add debian/extra/checkout-upstream: Script to replace the current
     source with a checkout of an upstream pull request, branch, or commit,
     and remove debian/patches/. Call from debian/rules if $TEST_UPSTREAM is
     set. This will be used for upstream CI.
  * Enable seccomp support on powerpc, ppc64el, and s390x.

1cf7bca... by Martin Pitt on 2016-02-04

Import patches-unapplied version 228-6 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e6a3923a89c67fa4507ba7f4f742a3e1921c5f54

New changelog entries:
  * Make-run-lock-tmpfs-an-API-fs.patch: Drop /run/lock from
    tmpfiles.d/legacy.conf to avoid the latter clobbering the permissions of
    /run/lock. Fixes fallout from cleanup in -5 that resulted /run/lock to
    have 0755 permissions instead of 1777. (LP: #1541775)

e6a3923... by Martin Pitt on 2016-02-03

Import patches-unapplied version 228-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 50c1d88a04c2335355c5ba09e0aaa2150198567d

New changelog entries:
  [ Martin Pitt ]
  * Drop systemd-vconsole-setup.service: It has never been installed/used in
    Debian and is not necessary for Ubuntu any more.
  * Drop halt-local.service. This has never been documented/used in Debian.
    (LP: #1532553)
  * debian/extra/initramfs-tools/scripts/init-bottom/udev: Prefer "nuke"
    again, it comes from klibc-utils. But fall back to "rm" if it does not
  * systemd-timesyncd.service.d/disable-with-time-daemon.conf: Also don't run
    if /usr/sbin/VBoxService exists, as virtualbox-guest-utils already
    provides time synchronization with the host. (Closes: #812522)
  * Drop Michael Stapelberg from Uploaders:, he stopped maintenance long ago.
    Thanks Michael for your great work in the past!
  * Replace "sysv-rc" dependency with Conflicts: openrc, file-rc. The
    rationale from #739679 still applies, but with the moving of
    {invoke,update}-rc.d to init-system-helpers we don't actually need
    anything from sysv-rc any more other than the assumption that SysV init
    scripts are enabled in /etc/rc?.d/ for the SysV generator to work (and
    file-rc and openrc don't do that).
  * debian/tests/timedated: Verify /etc/localtime symlink. Skip verifying the
    /etc/timezone file (which is Debian specific) if $TEST_UPSTREAM is set.
  * debian/tests/localed-locale: Check /etc/locale.conf if $TEST_UPSTREAM is
  * debian/tests/localed-x11-keymap: Test /etc/X11/xorg.conf.d/00-keyboard.conf
    if $TEST_UPSTREAM is set.
  * debian/tests/boot-and-services: Check for reaching graphical.target
    instead of default.target, as the latter is a session systemd state only.
  * debian/tests/boot-and-services: Skip tests which are known to fail/not
    applicable with testing upstream builds.
  * Drop Fix-up-tmpfiles.d-permissions-properly.patch:
    - /run/lock is already created differently by
      Make-run-lock-tmpfs-an-API-fs.patch, and contradicts to that.
    - /run/lock/lockdev/ isn't being used anywhere and got dropped
      upstream; backport the patch (tmpfiles-drop-run-lock-lockdev.patch).
    - Move dropping of "group:wheel" (which has never existed in Debian) into
      debian/rules, to also catch occurrences in other parts of the file which
      the static patch would overlook.
  * Shorten persistent identifier for CCW network interfaces (on s390x only).
    (LP: #1526808)
  * debian/rules: If $TEST_UPSTREAM is set (when building/testing upstream
    master instead of distro packages), don't fail on non-installed new files
    or new library symbols.
  * Add systemd-sysv conflict to upstart-sysv, and version the upstart
    conflict. This works with both Debian's and Ubuntu's upstart packages.
  [ Michael Biebl ]
  * Drop support for the /etc/udev/disabled flag file. This was a workaround
    for udev failing to install with debootstrap because it didn't use
    invoke-rc.d and therefor was not compliant with policy-rc.d. See #520742
    for further details. This is no longer the case, so supporting that file
    only leads to confusion about its purpose.
  * Retrigger cleanup of org.freedesktop.machine1.conf and
    hwclock-save.service now that dpkg has been fixed to correctly pass the
    old version to postinst on upgrade. (Closes: #802545)
  * Only ship *.link files as part of the udev package. The *.network files
    are solely used by systemd-networkd and should therefor be shipped by the
    systemd package. (Closes: #808237)
  * Cherry-pick a few fixes from upstream:
    - Fix unaligned access in initialize_srand(). (Closes: #812928)
    - Don't run kmod-static-nodes.service if module list is empty. This
      requires kmod v23. (Closes: #810367)
    - Fix typo in systemctl(1). (Closes: #807462)
    - Fix systemd-nspawn --link-journal=host to not fail if the directory
      already exists. (Closes: #808222)
    - Fix a typo in logind-dbus.c. The polkit action is named
      org.freedesktop.login1.power-off, not org.freedesktop.login1.poweroff.
    - Don't log an EIO error in gpt-auto-generator if blkid finds something
      which is not a partition table. (Closes: #765586)
    - Apply ACLs to /var/log/journal and also set them explicitly for
  * Only skip the filesystem check for /usr if the /run/initramfs/fsck-usr
    flag file exists. Otherwise we break booting with dracut which uses
    systemd inside the initramfs. (Closes: #810748)
  * Update the instructions in README.Debian for creating /var/log/journal.
    They are now in line with the documentation in the systemd-journald(8) man
    page and ensure that ACLs and group permissions are properly set.
    (Closes: #800947, #805617)
  * Drop "systemctl daemon-reload" from lsb init-functions hook. This is no
    longer necessary as invoke-rc.d and init-system-helpers take care of this