[systemd-commits] 4 commits - Makefile.am NEWS configure.ac src/journal src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Sep 21 15:35:54 PDT 2012
Makefile.am | 8 +++----
NEWS | 49 +++++++++++++++++++++++++++++++++++++++++++++--
configure.ac | 2 -
src/journal/mmap-cache.c | 4 +--
src/journal/mmap-cache.h | 2 -
src/shared/missing.h | 8 +++----
6 files changed, 59 insertions(+), 14 deletions(-)
New commits:
commit e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Sep 22 00:16:13 2012 +0200
journal: bring mmap cache prototype in sync
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
index de34634..0c42fb8 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
MMapCache* mmap_cache_ref(MMapCache *m);
MMapCache* mmap_cache_unref(MMapCache *m);
-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
void mmap_cache_close_fd(MMapCache *m, int fd);
void mmap_cache_close_context(MMapCache *m, unsigned context);
commit b6a867398de9f75fb623a84db7c6181d26b0a8d5
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 21 23:05:10 2012 +0200
build-sys: prepare release 191
diff --git a/Makefile.am b/Makefile.am
index 357a0b0..3ccd0fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
.DELETE_ON_ERROR:
LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
@@ -35,7 +35,7 @@ LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=4
+LIBSYSTEMD_LOGIN_REVISION=5
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
@@ -43,11 +43,11 @@ LIBSYSTEMD_DAEMON_REVISION=5
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=10
+LIBSYSTEMD_ID128_REVISION=11
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
LIBSYSTEMD_JOURNAL_AGE=5
# Dirs of external packages
diff --git a/NEWS b/NEWS
index 4bb01de..7b7f3c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,40 @@
systemd System and Service Manager
+CHANGES WITH 191:
+
+ * nspawn will now create a symlink /etc/localtime in the
+ container environment, copying the host's timezone
+ setting. Previously this has been done via a bind mount, but
+ since symlinks cannot be bind mounted this has now been
+ changed to create/update the appropriate symlink.
+
+ * journalctl -n's line number argument is now optional, and
+ will default to 10 if omitted.
+
+ * journald will now log the maximum size the journal files may
+ take up on disk. This is particularly useful if the default
+ built-in logic of determining this parameter from the file
+ system size is used. Use "systemctl status
+ systemd-journald.service" to see this information
+
+ * The multi-seat X wrapper tool has been stripped down. As X
+ is now capable of enumerating graphics devices via udev in a
+ seat-aware way the wrapper is not strictly necessary
+ anymore. A stripped down temporary stop-gap is still shipped
+ until the upstream display managers have been updated to
+ fully support the new X logic. Expect this wrapper to be
+ removed entirely in one the next releases.
+
+ * HandleSleepKey= in logind.conf has been split up into
+ HandleSuspendKey= and HandleHibernateKey=. The old setting
+ is not available anymore. The kernel and X11 is
+ distuingishing between these keys and we should too. This
+ also means the inhibition lock for these keys has been split
+ into two.
+
+ Changes from: Dave Airlie, Eelco Dolstra, Lennart Poettering,
+ Lukas Nykryn, Václav PavlÃn
+
CHANGES WITH 190:
* Whenever a unit changes state we'll now log this to the
@@ -119,7 +154,7 @@ CHANGES WITH 190:
for the host name (%H), the machine ID (%m) and the boot ID
(%b).
- Contributions from Allin Cottrell, Auke Kok, Brandon Philips,
+ Contributions from: Allin Cottrell, Auke Kok, Brandon Philips,
Colin Guthrie, Colin Walters, Daniel J Walsh, Dave Reisner,
Eelco Dolstra, Jan Engelhardt, Kay Sievers, Lennart
Poettering, Lucas De Marchi, Lukas Nykryn, Mantas MikulÄ—nas,
@@ -183,7 +218,7 @@ CHANGES WITH 189:
* Services which hit the restart limit will now be placed in a
failure state.
- Contributions from Bertram Poettering, Dave Reisner, Huang
+ Contributions from: Bertram Poettering, Dave Reisner, Huang
Hang, Kay Sievers, Lennart Poettering, Lukas Nykryn, Martin
Pitt, Simon Peeters, Zbigniew Jędrzejewski-Szmek
@@ -462,6 +497,7 @@ CHANGES WITH 186:
Shawn Landden, Tom Gundersen
CHANGES WITH 185:
+
* "systemctl help <unit>" now shows the man page if one is
available.
@@ -480,6 +516,7 @@ CHANGES WITH 185:
Matthias Clasen
CHANGES WITH 184:
+
* logind is now capable of (optionally) handling power and
sleep keys as well as the lid switch.
@@ -496,6 +533,7 @@ CHANGES WITH 184:
Menzel, Shawn Landden, Tero Roponen, Tom Gundersen
CHANGES WITH 183:
+
* Note that we skipped 139 releases here in order to set the
new version to something that is greater than both udev's
and systemd's most recent version number.
@@ -683,6 +721,7 @@ CHANGES WITH 183:
Gundersen
CHANGES WITH 44:
+
* This is mostly a bugfix release
* Support optional initialization of the machine ID from the
@@ -728,6 +767,7 @@ CHANGES WITH 44:
Reding
CHANGES WITH 43:
+
* This is mostly a bugfix release
* systems lacking /etc/os-release are no longer supported.
@@ -741,6 +781,7 @@ CHANGES WITH 43:
Biebl
CHANGES WITH 42:
+
* This is an important bugfix release for v41.
* Building man pages is now optional which should be useful
@@ -762,6 +803,7 @@ CHANGES WITH 42:
Schmidt, Michał Górny, Piotr Drąg
CHANGES WITH 41:
+
* The systemd binary is installed /usr/lib/systemd/systemd now;
An existing /sbin/init symlink needs to be adapted with the
package update.
@@ -789,6 +831,7 @@ CHANGES WITH 41:
William Douglas
CHANGES WITH 40:
+
* This is mostly a bugfix release
* We now expose the reason why a service failed in the
@@ -807,6 +850,7 @@ CHANGES WITH 40:
Mike Kazantsev, Ray Strode
CHANGES WITH 39:
+
* This is mostly a test release, but incorporates many
bugfixes.
@@ -864,6 +908,7 @@ CHANGES WITH 39:
Poettering, Michal Schmidt
CHANGES WITH 38:
+
* This is mostly a test release, but incorporates many
bugfixes.
diff --git a/configure.ac b/configure.ac
index f895f3f..2ee2314 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.64])
AC_INIT([systemd],
- [190],
+ [191],
[http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
[systemd],
[http://www.freedesktop.org/wiki/Software/systemd])
commit e18021f7daf6940e5fa87a35e320bb50fbd3e3ef
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 21 23:33:22 2012 +0200
journal: always keep marked mmap windows around
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 4be3f7e..88fe523 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -181,7 +181,7 @@ static void context_detach_window(Context *c) {
c->window = NULL;
LIST_REMOVE(Context, by_window, w->contexts, c);
- if (!w->contexts) {
+ if (!w->contexts && !w->keep_always) {
/* Not used anymore? */
LIST_PREPEND(Window, unused, c->cache->unused, w);
if (!c->cache->last_unused)
@@ -200,7 +200,7 @@ static void context_attach_window(Context *c, Window *w) {
context_detach_window(c);
- if (!w->contexts) {
+ if (w->in_unused) {
/* Used again? */
LIST_REMOVE(Window, unused, c->cache->unused, w);
if (!c->cache->last_unused)
commit 848af05524553aa8171de26323707ee06a9bd9d8
Author: Eelco Dolstra <eelco.dolstra at logicblox.com>
Date: Fri Sep 21 12:55:51 2012 -0400
missing: Fix compilation error due to wrong __NR_name_to_handle_at definition
"__NR_name_to_handle" should read "__NR_name_to_handle_at". This
fixes a compilation error on systems with older kernel headers.
diff --git a/src/shared/missing.h b/src/shared/missing.h
index c5bb71a..14abe4e 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -209,12 +209,12 @@ static inline pid_t gettid(void) {
#endif
#ifdef __x86_64__
-# ifndef __NR_name_to_handle
-# define __NR_name_to_handle 303
+# ifndef __NR_name_to_handle_at
+# define __NR_name_to_handle_at 303
# endif
#else
-# ifndef __NR_name_to_handle
-# define __NR_name_to_handle 341
+# ifndef __NR_name_to_handle_at
+# define __NR_name_to_handle_at 341
# endif
#endif
More information about the systemd-commits
mailing list