chiark / gitweb /
elogind.git
5 years agopath-util: fix breakage in path_is_mount_point
Dave Reisner [Thu, 18 Dec 2014 23:10:46 +0000 (18:10 -0500)]
path-util: fix breakage in path_is_mount_point

This fixes 2 problems introduced by 6feeeab0bc:

1) If name_to_handle_at returns ENOSYS for the child, we'll wrongly
return -ENOSYS when it returns the same for the parent. Immediately
jump to the fallback logic when we get ENOSYS.

2) If name_to_handle_at returns EOPNOTSUPP for the child but suceeds
for the parent, we'll be comparing an uninitialized value (mount_id) to
an initialized value (mount_id_parent). Initialize the mount_id
variables to invalid mount_ids to avoid this.

5 years agosystemd-hwdb: introduce new tool
Tom Gundersen [Mon, 15 Dec 2014 23:48:24 +0000 (00:48 +0100)]
systemd-hwdb: introduce new tool

This pulls out the hwdb managment from udevadm into an independent tool.

The old code is left in place for backwards compatibility, and easy of
testing, but all documentation is dropped to encourage use of the new
tool instead.

5 years agonetworkd: add FDB support
Alin Rauta [Wed, 17 Dec 2014 15:35:36 +0000 (07:35 -0800)]
networkd: add FDB support

5 years agojournal: next_with_matches() now does not need a mapped object as input
Michal Schmidt [Wed, 17 Dec 2014 14:46:30 +0000 (15:46 +0100)]
journal: next_with_matches() now does not need a mapped object as input

Now that journal_file_next_entry() does not need a pointer to the
current object, next_with_matches() does not need it either.

5 years agojournal: journal_file_next_entry() does not need pointer to current Object
Michal Schmidt [Wed, 17 Dec 2014 14:45:10 +0000 (15:45 +0100)]
journal: journal_file_next_entry() does not need pointer to current Object

The current offset is sufficient information.

5 years agojournal: optimize iteration by returning previously found candidate entry
Michal Schmidt [Wed, 17 Dec 2014 14:07:25 +0000 (15:07 +0100)]
journal: optimize iteration by returning previously found candidate entry

In next_beyond_location() when the JournalFile's location type is
LOCATION_SEEK, it means there's nothing to do, because we already have
the location of the candidate entry. Do an early return. Note that now
next_beyond_location() does not anymore guarantee on return that the
entry is mapped, but previous patches made sure the caller does not
care.

This optimization is at least as good as "journal: optimize iteration:
skip files that cannot improve current candidate entry" was.

Timing results on my workstation, using:
$ time ./journalctl -q --since=2014-06-01 --until=2014-07-01 > /dev/null

Before "Revert "journal: optimize iteration: skip files that cannot
improve current candidate entry":

real    0m5.349s
user    0m5.166s
sys     0m0.181s

Now:

real    0m3.901s
user    0m3.724s
sys     0m0.176s

5 years agojournal: optimize iteration by skipping exhausted files
Michal Schmidt [Thu, 18 Dec 2014 13:21:55 +0000 (14:21 +0100)]
journal: optimize iteration by skipping exhausted files

If from a previous iteration we know we are at the end of a journal
file, don't bother looking into the file again. This is complicated by
the fact that the EOF does not have to be permanent (think of
"journalctl -f"). So we also check if the number of entries in the
journal file changed.

This optimization has a similar effect as "journal: optimize iteration:
skip whole files behind current location" had.

5 years agojournal: drop unnecessary parameters of next_beyond_location()
Michal Schmidt [Wed, 17 Dec 2014 14:37:52 +0000 (15:37 +0100)]
journal: drop unnecessary parameters of next_beyond_location()

offset is redundant, because the caller can rely on f->current_offset.
The object pointer the function saves in *ret is thrown away by the caller.

5 years agojournal: remove redundant variable new_offset
Michal Schmidt [Thu, 18 Dec 2014 08:56:04 +0000 (09:56 +0100)]
journal: remove redundant variable new_offset

The file's current_offset is already updated at this point, so let's use
it.

5 years agojournal: compare candidate entries using JournalFiles' locations
Michal Schmidt [Wed, 17 Dec 2014 13:06:28 +0000 (14:06 +0100)]
journal: compare candidate entries using JournalFiles' locations

When comparing the locations of candidate entries, we can rely on the
location information stored in struct JournalFile.

5 years agojournal: simplify set_location()
Michal Schmidt [Tue, 16 Dec 2014 21:38:09 +0000 (22:38 +0100)]
journal: simplify set_location()

set_location() is called from real_journal_next() when a winning entry
has been picked from among the candidates in journal files.

The location type is always set to LOCATION_DISCRETE. No need to pass
it as a parameter.
The per-JournalFile location information is already updated at this
point. No need for having the direction and offset here.

5 years agojournal: keep per-JournalFile location info during iteration
Michal Schmidt [Tue, 16 Dec 2014 20:03:36 +0000 (21:03 +0100)]
journal: keep per-JournalFile location info during iteration

In next_beyond_location() when we find a candidate entry in a journal
file, save its location information in struct JournalFile.

The purpose of remembering the locations of candidate entries is to be
able to save work in the next iteration. This patch does only the
remembering part.

LOCATION_SEEK means the location identifies a candidate entry.
When a winner is picked from among candidates, it becomes
LOCATION_DISCRETE.
LOCATION_TAIL here signifies we've iterated the file to the end (or the
beginning in the case of reversed direction).

5 years agojournal: abstract the resetting of JournalFile's location
Michal Schmidt [Tue, 16 Dec 2014 19:54:56 +0000 (20:54 +0100)]
journal: abstract the resetting of JournalFile's location

5 years agojournal: move definition of LocationType to journal-file.h
Michal Schmidt [Tue, 16 Dec 2014 19:51:58 +0000 (20:51 +0100)]
journal: move definition of LocationType to journal-file.h

In preparation for individual JournalFiles maintaining a location
of their own.

5 years agoRevert "journal: optimize iteration: skip whole files behind current location"
Michal Schmidt [Tue, 16 Dec 2014 19:32:41 +0000 (20:32 +0100)]
Revert "journal: optimize iteration: skip whole files behind current location"

This reverts commit b7c88ab8cc7d55a43450bf3dea750f95f2e910d6.

This optimization will be made redundant by the following patches.

5 years agoRevert "journal: optimize iteration: skip files that cannot improve current candidate...
Michal Schmidt [Tue, 16 Dec 2014 19:32:34 +0000 (20:32 +0100)]
Revert "journal: optimize iteration: skip files that cannot improve current candidate entry"

This reverts commit f8b5a3b75fb55f0acb85c21424b3893c822742e9.

This optimization will be made redundant by the following patches.

5 years agojournal: delete unused function journal_file_skip_entry()
Michal Schmidt [Tue, 16 Dec 2014 14:47:01 +0000 (15:47 +0100)]
journal: delete unused function journal_file_skip_entry()

Its only caller is a test.

5 years agojournal: delete unused function journal_file_move_to_entry_by_offset()
Michal Schmidt [Tue, 16 Dec 2014 18:06:30 +0000 (19:06 +0100)]
journal: delete unused function journal_file_move_to_entry_by_offset()

5 years agocore: use raw_clone instead of fork in signal handler
Zbigniew Jędrzejewski-Szmek [Wed, 17 Dec 2014 04:53:23 +0000 (23:53 -0500)]
core: use raw_clone instead of fork in signal handler

fork() is not async-signal-safe and calling it from the signal handler
could result in a deadlock when at_fork() handlers are called. Using
the raw clone() syscall sidesteps that problem.

The tricky part is that raise() does not work, since getpid() does not
work. Add raw_getpid() to get the real pid, and use kill() instead of
raise().

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

5 years agotest-unit-file: add test for semicolon escaping
Zbigniew Jędrzejewski-Szmek [Thu, 18 Dec 2014 05:52:28 +0000 (00:52 -0500)]
test-unit-file: add test for semicolon escaping

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

5 years agoload-fragment: properly unescape \;
tomsod-m ya ru [Thu, 18 Dec 2014 04:01:06 +0000 (23:01 -0500)]
load-fragment: properly unescape \;

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

5 years agopath: make the check for unsupported name_to_handle_at symmetric
Zbigniew Jędrzejewski-Szmek [Thu, 18 Dec 2014 02:05:58 +0000 (21:05 -0500)]
path: make the check for unsupported name_to_handle_at symmetric

If child supports, but the parent does not, or when the child does
not support, but the parent does, assume the child is a mount point.

Only if neither supports use the fallback.

5 years agopath: follow symbolic link for parent path (2)
Umut Tezduyar Lindskog [Thu, 18 Dec 2014 00:43:58 +0000 (19:43 -0500)]
path: follow symbolic link for parent path (2)

c0e57ba9e22ee937722958d8b912ade2a37f206d fixed the fallback path.
We should do the same for name_to_handle_at().

5 years agomachinectl: add new commands for copying files from/to containers
Lennart Poettering [Thu, 18 Dec 2014 00:35:58 +0000 (01:35 +0100)]
machinectl: add new commands for copying files from/to containers

5 years agoutil: in make_stdio() use dup2() rather than dup3()
Lennart Poettering [Wed, 17 Dec 2014 20:54:00 +0000 (21:54 +0100)]
util: in make_stdio() use dup2() rather than dup3()

dup3() allows setting O_CLOEXEC which we are not interested in. However,
it also fails if called with the same fd as input and output, which is
something we don't want. Hence use dup2().

Also, we need to explicitly turn off O_CLOEXEC for the fds, in case the
input fd was O_CLOEXEC and < 3.

5 years agoupdate TODO
Lennart Poettering [Wed, 17 Dec 2014 20:53:54 +0000 (21:53 +0100)]
update TODO

5 years agomachinectl: implement "bind" command to create additional bind mounts from host to...
Lennart Poettering [Wed, 17 Dec 2014 20:51:45 +0000 (21:51 +0100)]
machinectl: implement "bind" command to create additional bind mounts from host to container during runtime

5 years agonspawn: fix invocation of the raw clone() system call on s390 and cris
Ken Werner [Tue, 16 Dec 2014 17:06:41 +0000 (18:06 +0100)]
nspawn: fix invocation of the raw clone() system call on s390 and cris

Since the order of the first and second arguments of the raw clone() system
call is reversed on s390 and cris it needs to be invoked differently.

5 years agohwdb: add Lenovo 3000 N200 special key
Marc Schmitzer [Wed, 17 Dec 2014 03:14:40 +0000 (22:14 -0500)]
hwdb: add Lenovo 3000 N200 special key

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

5 years agopath: follow symbolic link for parent path
Umut Tezduyar Lindskog [Tue, 16 Dec 2014 20:58:39 +0000 (21:58 +0100)]
path: follow symbolic link for parent path

[zj: When we lstat the target path, symlinks above the last component
     will be followed by both stat and lstat. So when we look at the
     parent, we should follow symlinks.]

5 years agoshared: strv - add strv_clear()
Tom Gundersen [Wed, 17 Dec 2014 00:08:56 +0000 (01:08 +0100)]
shared: strv - add strv_clear()

This frees the elements of the strv without freeing the strv itself.

5 years agoshared: path-util - memory leak
Tom Gundersen [Tue, 16 Dec 2014 21:24:54 +0000 (22:24 +0100)]
shared: path-util - memory leak

5 years agoudev: net_setup - fix warning
Tom Gundersen [Tue, 16 Dec 2014 20:49:06 +0000 (21:49 +0100)]
udev: net_setup - fix warning

5 years agotest-json: use fabs
Thomas Hindoe Paaboel Andersen [Tue, 16 Dec 2014 19:36:40 +0000 (20:36 +0100)]
test-json: use fabs

5 years agofix compiler warning
Susant Sahani [Tue, 16 Dec 2014 03:18:34 +0000 (08:48 +0530)]
fix compiler warning

src/shared/utf8.c:268:13: warning: unused variable 'd'
[-Wunused-variable]
         int d;

5 years agosystemctl: fix argument handling when invoked as "shutdown"
Jan Synacek [Mon, 15 Dec 2014 09:39:00 +0000 (10:39 +0100)]
systemctl: fix argument handling when invoked as "shutdown"

5 years agonss-myhostname: also recognize "gateway."
Harald Hoyer [Mon, 15 Dec 2014 10:34:24 +0000 (11:34 +0100)]
nss-myhostname: also recognize "gateway."

"gateway." skips adding the domain search path and saves some queries to
the nameserver.

5 years agoUpdate TODO
Zbigniew Jędrzejewski-Szmek [Tue, 16 Dec 2014 05:22:58 +0000 (00:22 -0500)]
Update TODO

5 years agosystemctl: refuse to edit runtime dropins when they already exist in /etc
Zbigniew Jędrzejewski-Szmek [Tue, 16 Dec 2014 04:01:05 +0000 (23:01 -0500)]
systemctl: refuse to edit runtime dropins when they already exist in /etc

The check for existing unit files and dropins is unified.

path_join() is updated to not insert duplicate separators.

5 years agosystemctl: share path lookup between 'cat' and 'edit'
Zbigniew Jędrzejewski-Szmek [Sat, 13 Dec 2014 21:38:35 +0000 (16:38 -0500)]
systemctl: share path lookup between 'cat' and 'edit'

'systemctl cat' now works for templates too.

'systemctl edit' does not refuse to edit units that have changed on
disk. That restriction didn't seem useful, actually editing units that
have changed on disk before they are started is very reasonable.

'edit' with instances and templates works again:

Now:

$ build/systemctl edit getty@
Failed to copy /etc/systemd/system/getty@.service.d/override.conf to /etc/systemd/system/getty@.service.d/.override.confdff6290408c86369: Permission denied
$ build/systemctl edit getty@tty3
Failed to create directories for /etc/systemd/system/getty@tty3.service.d/override.conf: Permission denied
$ build/systemctl edit --full getty@tty3
Failed to copy /usr/lib/systemd/system/getty@.service to /etc/systemd/system/.getty@tty3.serviced3d175087e7e439b: Permission denied
Failed to create temporary file for /etc/systemd/system/getty@tty3.service: Permission denied
$ build/systemctl edit --full getty@
Failed to copy /usr/lib/systemd/system/getty@.service to /etc/systemd/system/.getty@.servicea3caad491c0f2f3d: Permission denied
Failed to create temporary file for /etc/systemd/system/getty@.service: Permission denied

5 years agosystemctl: split out LookupPaths initialization
Zbigniew Jędrzejewski-Szmek [Tue, 16 Dec 2014 05:28:43 +0000 (00:28 -0500)]
systemctl: split out LookupPaths initialization

5 years agosystemctl: move two functions up
Zbigniew Jędrzejewski-Szmek [Tue, 16 Dec 2014 05:28:41 +0000 (00:28 -0500)]
systemctl: move two functions up

No functional change.

5 years agosystemctl: unify warning about unit files changed on disk
Zbigniew Jędrzejewski-Szmek [Tue, 16 Dec 2014 04:28:38 +0000 (23:28 -0500)]
systemctl: unify warning about unit files changed on disk

5 years agosystemctl: do not use -1 for return code
Zbigniew Jędrzejewski-Szmek [Sat, 13 Dec 2014 17:43:07 +0000 (12:43 -0500)]
systemctl: do not use -1 for return code

Also make the error messages more specific to give a hint to the user
how to solve the problem.

5 years agoMove dropin listing to shared
Zbigniew Jędrzejewski-Szmek [Mon, 15 Dec 2014 04:12:40 +0000 (23:12 -0500)]
Move dropin listing to shared

No functional change. This is in preparation for using this in
systemctl in the future.

5 years agohwdb: Logitech MX1000, another Lenovo USB mouse
Peter Hutterer [Tue, 16 Dec 2014 05:08:07 +0000 (15:08 +1000)]
hwdb: Logitech MX1000, another Lenovo USB mouse

Provided by Benjamin Bellec

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

5 years agohwdb: more an entry for the MS Sculpt Ergonomic
Peter Hutterer [Thu, 11 Dec 2014 07:33:14 +0000 (17:33 +1000)]
hwdb: more an entry for the MS Sculpt Ergonomic

Note that the MS receivers likely work like the Logitech ones, i.e. all
devices connected show up with the same vid/pid/name. Full evidence remains to
be gathered.

5 years agoshared: add minimal JSON tokenizer
Lennart Poettering [Mon, 15 Dec 2014 21:26:56 +0000 (22:26 +0100)]
shared: add minimal JSON tokenizer

5 years agoudev: builtin-hwdb - port to sd-hwdb
Tom Gundersen [Mon, 15 Dec 2014 18:58:25 +0000 (19:58 +0100)]
udev: builtin-hwdb - port to sd-hwdb

5 years agoudevadm: port to sd-hwdb
Tom Gundersen [Mon, 15 Dec 2014 18:48:21 +0000 (19:48 +0100)]
udevadm: port to sd-hwdb

5 years agonetworkctl: port from libudev to sd-hwdb
Tom Gundersen [Mon, 15 Dec 2014 19:07:34 +0000 (20:07 +0100)]
networkctl: port from libudev to sd-hwdb

5 years agoupdate TODO
Lennart Poettering [Mon, 15 Dec 2014 17:48:20 +0000 (18:48 +0100)]
update TODO

5 years agounit: handle nicely of certain unit types are not supported on specific systems
Lennart Poettering [Fri, 12 Dec 2014 20:05:32 +0000 (21:05 +0100)]
unit: handle nicely of certain unit types are not supported on specific systems

Containers do not really support .device, .automount or .swap units;
Systems compiled without support for swap do not support .swap units;
Systems without kdbus do not support .busname units.

With this change attempts to start a unsupported unit types will result
in an immediate "unsupported" job result, which is a lot more
descriptive then before. Also, attempts to start device units in
containers will now immediately fail instead of causing jobs to be
enqueued that never go away.

5 years agonetworkd: failing to track links is a serious problem so log at warning level rather...
Tom Gundersen [Mon, 15 Dec 2014 16:57:51 +0000 (17:57 +0100)]
networkd: failing to track links is a serious problem so log at warning level rather than debug

5 years agohwdb: fix ordering
Daniel Mack [Mon, 15 Dec 2014 16:15:16 +0000 (17:15 +0100)]
hwdb: fix ordering

We sort by default DPI, not the first one in the list.

5 years agohwdb: Logitech G400s
Daniel Mack [Mon, 15 Dec 2014 16:11:31 +0000 (17:11 +0100)]
hwdb: Logitech G400s

Provided by Peter Hutterer:

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

5 years agohwdb: Logitech MX 518
Harald Hoyer [Mon, 15 Dec 2014 10:26:38 +0000 (11:26 +0100)]
hwdb: Logitech MX 518

5 years agoshared: time-dst: Avoid buffer overflow
Martin Pitt [Mon, 15 Dec 2014 12:06:48 +0000 (13:06 +0100)]
shared: time-dst: Avoid buffer overflow

Commit 681f9718 introduced an additional null terminator for the zone names.
Increase the allocation of "transitions" to actually make room for this.

5 years agoblkid: Warn when rejecting a superblock with a bad csum
Gabriel de Perthuis [Sat, 13 Dec 2014 00:56:56 +0000 (01:56 +0100)]
blkid: Warn when rejecting a superblock with a bad csum

Bump libblkid requirement from 2.20 to 2.24.
util-linux 2.25 is actually required since fdbbad981cc5da8bb4ed7e9b6646e7a114745ec5

5 years agodelta: fix output alignment of [REDIRECTED] entries
Ivan Shapovalov [Sun, 14 Dec 2014 13:04:01 +0000 (16:04 +0300)]
delta: fix output alignment of [REDIRECTED] entries

5 years agobuild-sys: remove commented-out m4 from user@.service
Mantas Mikulėnas [Sun, 14 Dec 2014 17:12:34 +0000 (19:12 +0200)]
build-sys: remove commented-out m4 from user@.service

Otherwise this actually remains in the generated unit in /usr/lib.

If you want to keep it commented out, a m4-compatible way would be:

    m4_ifdef(`HAVE_SMACK',
    dnl Capabilities=cap_mac_admin=i
    dnl SecureBits=keep-caps
    )

5 years agobuild-sys: fix distcheck
Dave Reisner [Sun, 14 Dec 2014 15:55:16 +0000 (10:55 -0500)]
build-sys: fix distcheck

- fix misspelling in filename (intenal -> internal)
- remove deleted hwdb-related file (nuked with sd-hwdb refactor)

5 years agobuild-sys: always distribute systemd-consoled.service.in
Dave Reisner [Sun, 14 Dec 2014 15:40:25 +0000 (10:40 -0500)]
build-sys: always distribute systemd-consoled.service.in

Similar to how we handle other facilities that can be flagged out at
configure time, we should always distribute this input file.

http://lists.freedesktop.org/archives/systemd-devel/2014-December/026272.html

5 years agosystemctl: handle correctly template units for edit verb
Ronny Chevalier [Sat, 13 Dec 2014 14:14:48 +0000 (15:14 +0100)]
systemctl: handle correctly template units for edit verb

Previously, if we provided getty@.service to systemctl edit it would
have failed when using the bus because it is an invalid unit name.
But it would have succeeded when searching in the filesystem.

Now, we check if we have a template, if we do we search in the
filesystem, if we don't have a templae and we can use the bus, we do.

Furthermore, if we provided getty@tty1.service it would not have worked
when searching the filesystem, but it would have worked with the bus.
So now, when using the filesystem we use the template name and not the
unit name, and the same when logging errors.

(Also did a refactoring to avoid a long function)

5 years agotest-unit-name: add more tests
Ronny Chevalier [Sat, 13 Dec 2014 14:12:38 +0000 (15:12 +0100)]
test-unit-name: add more tests

Add more test cases for:
- unit_name_is_instance
- unit_name_to_instance

Add tests for:
- unit_name_template
- unit_name_is_template

5 years agojournal: replace contexts hashmap with a plain array
Michal Schmidt [Wed, 3 Dec 2014 17:25:44 +0000 (18:25 +0100)]
journal: replace contexts hashmap with a plain array

try_context() is such a hot path that the hashmap lookup is expensive.

The number of contexts is small - it is the number of object types.
Using a hashmap is overkill. A plain array will do.

Before:
$ time ./journalctl --since=2014-06-01 --until=2014-07-01 > /dev/null

real    0m9.445s
user    0m9.228s
sys     0m0.213s

After:
$ time ./journalctl --since=2014-06-01 --until=2014-07-01 > /dev/null
real    0m5.438s
user    0m5.266s
sys     0m0.170s

5 years agojournal: delete unused function mmap_cache_close_context
Michal Schmidt [Wed, 3 Dec 2014 17:23:23 +0000 (18:23 +0100)]
journal: delete unused function mmap_cache_close_context

This never had any callers. Contexts are freed when the MMapCache is
freed.

5 years agojournal: push type_to_context conversion down to journal_file_move_to()
Michal Schmidt [Fri, 12 Dec 2014 22:20:05 +0000 (23:20 +0100)]
journal: push type_to_context conversion down to journal_file_move_to()

5 years agojournal: have a named enum ObjectType
Michal Schmidt [Wed, 10 Dec 2014 14:18:49 +0000 (15:18 +0100)]
journal: have a named enum ObjectType

5 years agojournal: consistently use OBJECT_<type> names instead of numbers
Michal Schmidt [Fri, 12 Dec 2014 21:51:24 +0000 (22:51 +0100)]
journal: consistently use OBJECT_<type> names instead of numbers

Note that numbers 0 and -1 are both replaced with OBJECT_UNUSED,
because they are treated the same everywhere (e.g. type_to_context()
translates them both to 0).

5 years agojournal: consistently allow type==0 to mean "any type"
Michal Schmidt [Wed, 10 Dec 2014 15:37:29 +0000 (16:37 +0100)]
journal: consistently allow type==0 to mean "any type"

If type==0 and a non-NULL object were given as arguments to
journal_file_hmac_put_object(), its object type check would fail and it
would return -EBADMSG.

All existing callers use either a positive type or -1. Still, for
behavior consistency with journal_file_move_to_object() let's allow
type 0 to pass.

5 years agojournal: move type_to_context() to journal-file.c
Michal Schmidt [Fri, 12 Dec 2014 17:06:22 +0000 (18:06 +0100)]
journal: move type_to_context() to journal-file.c

It has no other callers. It does not need to be in the header file.

5 years agojournal: remove journal_file_object_keep/release functions
Michal Schmidt [Fri, 12 Dec 2014 20:52:18 +0000 (21:52 +0100)]
journal: remove journal_file_object_keep/release functions

The only user is sd_journal_enumerate_unique() and, as explained in
the previous commit (fed67c38e3 "journal: map objects to context set by
caller, not by actual object type"), the use of them there is now
superfluous. Let's remove them.

This reverts major parts of commits:
  ae97089d49 journal: fix access to munmapped memory in
             sd_journal_enumerate_unique
  06cc69d44c sd-journal: fix sd_journal_enumerate_unique skipping values

Tested with an "--enable-debug" build and "journalctl --list-boots".
It gives the expected number of results. Additionally, if I then revert
the previous commit ("journal: map objects to context set by caller, not
to actual object type"), it crashes with SIGSEGV, as expected.

5 years agojournal: map objects to context set by caller, not by actual object type
Michal Schmidt [Fri, 12 Dec 2014 17:21:55 +0000 (18:21 +0100)]
journal: map objects to context set by caller, not by actual object type

When the caller of journal_file_move_to_object() specifies type==0,
the object header is at first mapped in context 0. Then after the header
is checked, the whole object is mapped in a context determined by
the actual object type (which is not even range-checked using
type_to_context()). This looks wrong. It should map in the
caller-specified context.

An old comment in sd_journal_enumerate_unique() supports this view:
    /* We do not use the type context here, but 0 instead,
     * so that we can look at this data object at the same
     * time as one on another file */
Clearly the expectation was that the data object will remain mapped
in context 0 without being pushed away by mapping other objects in
context OBJECT_DATA.

I suspect that this was the real bug that got fixed by ae97089d49
"journal: fix access to munmapped memory in sd_journal_enumerate_unique".
In other words, journal_file_object_keep/release are superfluous after
applying this patch.

5 years agojournal: add debug mode for mmap-cache (--enable-debug=mmap-cache)
Michal Schmidt [Fri, 12 Dec 2014 16:57:22 +0000 (17:57 +0100)]
journal: add debug mode for mmap-cache (--enable-debug=mmap-cache)

This is useful for exposing unsafe access to mmapped objects after
the context that they were mapped in was already moved.

For example:
journal_file_move_to_object(f1, OBJECT_DATA, p1, &o1);
journal_file_move_to_object(f2, OBJECT_DATA, p2, &o2);
t = o1->object.type; /* this usually works, but is unsafe */

5 years agoconfigure.ac: add a generic --enable-debug, replace --enable-hashmap-debug
Michal Schmidt [Fri, 12 Dec 2014 16:48:13 +0000 (17:48 +0100)]
configure.ac: add a generic --enable-debug, replace --enable-hashmap-debug

There will be more debugging options later.
 --enable-debug will enable them all.
 --enable-debug=hashmap will enable only hashmap debugging.

Also rename the C #define to ENABLE_DEBUG_* pattern.

5 years agoshared/hashmap.h: fix comment
Michal Schmidt [Fri, 12 Dec 2014 16:42:28 +0000 (17:42 +0100)]
shared/hashmap.h: fix comment

An early version used underscore prefixes for internal functions, but
the current version uses the prefix "internal_".

5 years agohwdb: add more mice
Zbigniew Jędrzejewski-Szmek [Fri, 12 Dec 2014 23:20:51 +0000 (18:20 -0500)]
hwdb: add more mice

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

5 years agohwdb: sort mice by brand,type,dpi,frequency
Zbigniew Jędrzejewski-Szmek [Fri, 12 Dec 2014 23:16:45 +0000 (18:16 -0500)]
hwdb: sort mice by brand,type,dpi,frequency

This way entries from the same brand with the same dpi and frequency
can be coalesced. It is also visually easier to find the right DPI
than order hexadecimal identifiers.

5 years agonetworkctl: remove unused variable
Thomas Hindoe Paaboel Andersen [Fri, 12 Dec 2014 20:53:28 +0000 (21:53 +0100)]
networkctl: remove unused variable

5 years agowrap a few *_FOREACH macros in curly braces
Thomas Hindoe Paaboel Andersen [Fri, 12 Dec 2014 18:51:41 +0000 (19:51 +0100)]
wrap a few *_FOREACH macros in curly braces

cppcheck would give up with "syntax error" without them. This led
to reports of syntax errors in unrelated locations and potentially
hid other errors

5 years agoupdate TODO
Lennart Poettering [Fri, 12 Dec 2014 19:24:35 +0000 (20:24 +0100)]
update TODO

5 years agocore: retry unmounting until we are done, in case of stacked mounts
Lennart Poettering [Fri, 12 Dec 2014 19:12:35 +0000 (20:12 +0100)]
core: retry unmounting until we are done, in case of stacked mounts

5 years agonetworkctl: also draw a nice unicode cirlce when "networkctl status" is run without...
Lennart Poettering [Fri, 12 Dec 2014 18:11:35 +0000 (19:11 +0100)]
networkctl: also draw a nice unicode cirlce when "networkctl status" is run without parameters

5 years agonetworkctl: show interface names next to IP addresses if we dump adresses from all...
Lennart Poettering [Fri, 12 Dec 2014 18:07:26 +0000 (19:07 +0100)]
networkctl: show interface names next to IP addresses if we dump adresses from all interfaces

5 years agonetworkctl: also show gateway address when "networkctl status" without further argume...
Lennart Poettering [Fri, 12 Dec 2014 17:57:15 +0000 (18:57 +0100)]
networkctl: also show gateway address when "networkctl status" without further arguments is passed

5 years agonetworkctl: show MAC address OUI vendor next to MAC addresses
Lennart Poettering [Fri, 12 Dec 2014 17:50:06 +0000 (18:50 +0100)]
networkctl: show MAC address OUI vendor next to MAC addresses

5 years agotest-cap-list: always check libcap comes to the same names as we do, for the names...
Lennart Poettering [Fri, 12 Dec 2014 17:42:19 +0000 (18:42 +0100)]
test-cap-list: always check libcap comes to the same names as we do, for the names it knows

5 years agocap-list: return lower-case capability names, similar to libcap's cap_to_name(),...
Lennart Poettering [Fri, 12 Dec 2014 17:37:25 +0000 (18:37 +0100)]
cap-list: return lower-case capability names, similar to libcap's cap_to_name(), for compat reasons

5 years agoupdate TODO
Lennart Poettering [Fri, 12 Dec 2014 16:30:02 +0000 (17:30 +0100)]
update TODO

5 years agoman: fedora 21 has been release, suggest 21 as fedora version in example yum command...
Lennart Poettering [Fri, 12 Dec 2014 16:29:12 +0000 (17:29 +0100)]
man: fedora 21 has been release, suggest 21 as fedora version in example yum command line

5 years agonspawn: when booting in ephemeral mode, append random token to machine name
Lennart Poettering [Fri, 12 Dec 2014 16:26:31 +0000 (17:26 +0100)]
nspawn: when booting in ephemeral mode, append random token to machine name

Also, when booting up an ephemeral container of / use the system
hostname as default machine name.

This way specifiyng -M is unnecessary when booting up an ephemeral
container, while allowing any number of ephemeral containers to run from
the same tree.

5 years agonspawn: allow spawning ephemeral nspawn containers based on the root file system...
Lennart Poettering [Fri, 12 Dec 2014 15:59:15 +0000 (16:59 +0100)]
nspawn: allow spawning ephemeral nspawn containers based on the root file system of the OS

This works now:

        # systemd-nspawn -xb -D / -M foobar

Which boots up an ephemeral container, based on the host's root file
system. Or in other words: you can now run the very same host OS you
booted your system with also in a container, on top of it, without
having it interfere. Great for testing whether the init system you are
hacking on still boots without reboot the system!

5 years agonspawn: don't link journals in ephemeral mode
Lennart Poettering [Fri, 12 Dec 2014 15:58:57 +0000 (16:58 +0100)]
nspawn: don't link journals in ephemeral mode

5 years agonspawn: properly unset arg_link_journal_try, when --link-journal= is specified
Lennart Poettering [Fri, 12 Dec 2014 15:58:30 +0000 (16:58 +0100)]
nspawn: properly unset arg_link_journal_try, when --link-journal= is specified

5 years agocopy: use btrfs reflinking only whe we know we copy full files
Lennart Poettering [Fri, 12 Dec 2014 15:24:33 +0000 (16:24 +0100)]
copy: use btrfs reflinking only whe we know we copy full files

5 years agobus: send attach flags on BUS_MAKE
David Herrmann [Fri, 12 Dec 2014 13:02:57 +0000 (14:02 +0100)]
bus: send attach flags on BUS_MAKE

Make sure to set send-attach-flags on BUS_MAKE. These control which
information is revealed about the bus-owner.

5 years agobus: fix assert() on HELLO error-path
David Herrmann [Fri, 12 Dec 2014 13:02:05 +0000 (14:02 +0100)]
bus: fix assert() on HELLO error-path

Make sure we don't call into any bus_kernel_*() functions before
b->is_kernel is set to true. Hard-code the CMD_FREE just like the other
helpers do.

5 years agonspawn: beef up nspawn with some btrfs magic
Lennart Poettering [Fri, 12 Dec 2014 02:50:59 +0000 (03:50 +0100)]
nspawn: beef up nspawn with some btrfs magic

This adds --template= to duplicate an OS tree as btrfs snpashot and run
it

This also adds --ephemeral or -x to create a snapshot of an OS tree and
boot that, removing it after exit.

5 years agocopy: teach copy_bytes() btrfs reflink magic
Lennart Poettering [Fri, 12 Dec 2014 02:20:53 +0000 (03:20 +0100)]
copy: teach copy_bytes() btrfs reflink magic