lp:~yuningdodo/systemd/systemd.trusty-proposed.lp1313522

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty-proposed/systemd

Ubuntu Development Team: Pending requested 2014-05-07

Diff: 1581 lines (+1423/-19)

12 files modified

.pc/Advertise-hibernation-only-if-there-s-enough-free-sw.patch/src/shared/fileio.c (+596/-0)
.pc/Advertise-hibernation-only-if-there-s-enough-free-sw.patch/src/shared/fileio.h (+37/-0)
.pc/Advertise-hibernation-only-if-there-s-enough-free-sw.patch/src/shared/sleep-config.c (+179/-0)
.pc/Advertise-hibernation-only-if-there-s-enough-free-sw.patch/src/test/test-fileio.c (+145/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+8/-0)
debian/patches/Advertise-hibernation-only-if-there-s-enough-free-sw.patch (+289/-0)
debian/patches/series (+1/-0)
src/shared/fileio.c (+34/-0)
src/shared/fileio.h (+2/-0)
src/shared/sleep-config.c (+107/-19)
src/test/test-fileio.c (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1313522: There is hibernate option even without an active swap partition

Medium

Fix Released

Link a bug report

Related blueprints

73. By Yu Ning on 2014-05-07

[Martin Pitt]
  * Advertise hibernation only if there's enough free swap. Patches backported
    from current upstream. (LP: #1313522)

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.

64. By Martin Pitt on 2014-02-28

* Mark autopkgtest with "isolation-machine" as this test can't run in
  schroot or LXC.
* Import latest keymaps from upstream git.