lp://staging/ubuntu/utopic-proposed/systemd

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

74. By Martin Pitt on 2014-04-27

* Merge with Debian unstable. Remaining Ubuntu changes:
  - Add cgmanager support for logind.
  - Add patches for specifying an alternate /etc/machine-id location, skip
    tests that fail on buildds (presumably due to missing /etc/hostname),
    and run tests during package build.
  - Cherry-pick hwdb updates and the keymap builtin, and pull latest keymap
    hwdb from upstream trunk.
  - Fix FTBFS against recent kernels & glibc.
  - Enable all cgroup controllers in logind, for unprivileged LXC
    containers.
  - Fix a race condition at boot with serio devices. (LP #1014460)
  - Create disk/by-partlabel links for mmcblk partitions.
  - Hack to support system-image read-only /etc, and modify files in
    /etc/writable/ instead.
  - debian/rules: Drop doc dir symlinking. It creates havoc with dpkg
    upgrades, and we already have the automatic per-file symlinking.
  - debian/rules: Add an epoch to libgudev.
  - Don't build the systemd-sysv package for now.
  - Drop 80-networking.rules and the Debian *.agent scripts, we never
    supported them in Ubuntu.
  - Keep our much simpler udev maintainer scripts (all platforms must
    support udev, no debconf).
  - Add udev Apport package hook.
  - debian/extra/initramfs.top: Drop $ROOTDELAY, we do that in a more
    sensible way with wait-for-root. Will get applicable to Debian once
    Debian gets wait-for-root in initramfs-tools.
  - debian/extra/initramfs.bottom: If LVM is installed, settle udev,
    otherwise we get missing LV symlinks. Workaround for LP #1185394.
  - Add 40-hyperv-hotadd.rules: Workaround for LP #1233466.
  - Mark graphics devices as PRIMARY_DEVICE_FOR_DISPLAY so that we can wait
    for those in plymouth.

  Upgrade fixes, keep until 16.04 LTS release:
  - systemd Conflicts/Replaces/Provides systemd-services.
  - Remove obsolete systemd-logind upstart job.

73. By Martin Pitt on 2014-04-26

* Merge with Debian unstable. Drop the systemd-services split as we want to
  move to systemd as pid 1 (UbuntuSpec:core-1403-systemd-transition) so that
  we can start experimenting with booting Ubuntu with systemd. This does NOT
  yet change the default, with this upstart will still be used to bring up
  the system. To boot with systemd, add init=/lib/systemd/systemd to the
  grub menu (at boot or in /etc/default/grub GRUB_CMDLINE_LINUX_DEFAULT).

  Remaining Ubuntu specific changes:
  - debian/rules: Don't build the systemd-sysv package for now.
  - debian/udev.templates: Drop debconfiscation of udev, not necessary for
    Ubuntu. Drop debconf pre-dependency.
  - debian/extra/initramfs.top: Drop $ROOTDELAY, we do that in a more
    sensible way with wait-for-root. (Will get applicable to Debian once
    Debian gets wait-for-root in initramfs-tools.)
  - Drop debian/extra/{50-udev-default.rules,60-persistent-storage*.rules,
    75-cd-aliases-generator.rules,80-drivers.rules,80-networking.rules,
    91-permissions.rules}: These are the Debian specific rules, in Ubuntu we
    have always used the upstream ones.
  - Add debian/extra/rules/78-graphics-card.rules: Mark graphics devices as
    PRIMARY_DEVICE_FOR_DISPLAY so that we can wait for those in plymouth.
  - Add debian/extra/rules/73-idrac.rules: On Dell PowerEdge systems, the
    iDRAC7 and later support a USB Virtual NIC for management. Name this
    interface "idrac" to avoid confusion with "real" network interfaces.
  - Add debian/extra/udev.py: Apport hook.
  - debian/extra/udev.startup, debian/rules: Don't install/support
    /etc/udev/links.conf, that's a hack (if you want links, create udev
    rules).
  - Drop debian/source/{git-patches,options}, we use proper patches.
  - debian/rules: We continue to use the old net iface naming schema for the
    time being. Install old udev rule generator in debian/udev.install.
  - debian/rules: Don't install init.d scripts, only the upstart jobs.
  - debian/rules: Add an epoch to libgudev.
  - Drop debian/udev.dirs, not necessary.
  - Drop debian/udev.NEWS, debian/udev.maintscript: Not applicable to
    Ubuntu.
  - debian/udev.{postinst,postrm,preinst,prerm}: Keep our much simpler
    versions (all platforms must support udev, no debconf).
  - debian/rules: Drop doc dir symlinking. It creates havoc with dpkg
    upgrades, and we already have the automatic per-file symlinking.
  - Add debian/extra/rules/40-hyperv-hotadd.rules: Workaround for LP #1233466
  - Various debian/patches/*, see patch headers.

  Applicable to Debian:
  - Add libpam-systemd.systemd-logind.upstart to bring up logind at boot
    when using upstart.
  - debian/control, debian/tests/: Add autopkgtest.
  - debian/extra/initramfs.hook, debian/udev.*{pre,post}inst: Divert udevadm
    to udevadm.upgrade during upgrades while udev is unconfigured.
  - Add debian/extra/60-keyboard.hwdb: Latest upstream keymaps, for easy
    backporting.
  - debian/extra/initramfs.bottom: If LVM is installed, settle udev,
    otherwise we get missing LV symlinks. (LP #1185394)
  - Add debian/extra/README-{etc,lib}-rules.d documentation, install into
    udev.
  - debian/rules: Run tests during package build.
  - debian/udev.udev-finish.upstart: Fix path to tmp-rules,
    debian/extra/rule_generator.functions creates them in /run/udev/.
  - debian/udev-udeb.install: Add 64-btrfs.rules, 75-probe_mtd.rules, and
    80-drivers.rules, they are potentially useful in a d-i environment.
  - debian/extra/rules/75-persistent-net-generator.rules: Add new block of
    Windows Azure ethernet hardware address to ignore persistent naming
    (LP #1274348).
  - debian/extra/udev.startup: Mount devpts with the correct permissions to
    avoid needing pt_chown.
  - debian/libpam-systemd.prerm: Do proper refcounting of the PAM module
    package on prerm, so that we don't drop the module from the PAM config
    when uninstalling a foreign-arch package. Related to LP #1295521.
  - Run dh_install with --list-missing.

  Upgrade fixes, keep until 16.04 LTS release:
  - debian/control: Conflicts/Replaces/Provides systemd-services.
* debian/tests/timedated: Get along with comments in /etc/timezone,
  cloud-init puts one there.

72. By Stéphane Graber on 2014-04-14

systemd-logind.conf: Don't use the limit stanza which fails the
whole job when failing to set the ulimit. Instead call ulimit itself
from the job and ignore its return code. This allow systemd-logind to
start in unprivileged LXC containers. (LP: #1307595)

71. By Serge Hallyn on 2014-04-11

cgmanager: don't call nih_dbus_setup() since we won't use the
nih_mainloop(). (LP: #1303649)

70. By Martin Pitt on 2014-04-10

* Revert "Do not restart logind on package upgrades" change from
  204-0ubuntu1. This is obsolete now, as we only ever shipped version 204 in
  stable releases. This was an intra-development release upgrade fix only,
  and it did not even work properly. This fixes logind not getting started
  on package install. (LP: #1305395)
* Update 60-keyboard.hwdb from upstream git. Adds Samsung Series 7 Ultra.
* debian/libpam-systemd.systemd-logind.upstart: Don't try to mount
  /sys/fs/cgroup/systemd in a container, as that will fail. cgmanager will
  be used for these cases.

69. By Stéphane Graber on 2014-04-04

Fix crash on systems without cgmanager. (LP: #1302264)

68. By Stéphane Graber on 2014-04-03

[ Stéphane Graber ]
* Never call normalize_controller when controll is NULL as this
  triggers an assert... (LP: #1301846)

[ Serge Hallyn ]
* d/p/add-cgmanager-support: make sure connections are closed (LP: #1301882)

67. By Adam Conrad on 2014-04-02

Pass --disable-cgmanager in the udeb build pass, d-i doesn't need it.

66. By Stéphane Graber on 2014-04-01

[ Steve Langasek ]
* Do proper refcounting of the PAM module package on prerm, so that we
  don't drop the module from the PAM config when uninstalling a
  foreign-arch package. Related to Ubuntu bug #1295521.

[ Stéphane Graber ]
* Add cgmanager support to logind. This will use the cgmanager socket
  instead of cgroupfs when cgmanager is available. Otherwise it'll simply
  fallback on the cgroupfs code. (LP: #1297363)

65. By Dimitri John Ledkov on 2014-02-28

Fix FTBFS against recent kernels & glibc.