1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 06:52:22 +03:00
Commit Graph

25068 Commits

Author SHA1 Message Date
Lennart Poettering
8222cf9145 units: downgrade dependency on /tmp in basic.target to Wants=
Now that requiring of a masked unit results in failure again, downgrade the dependency on /tmp to Wants= again, so that
our suggested way to disable /tmp-on-tmpfs by masking doesn't result in a failing boot.

References: #2315
2016-02-09 20:34:27 +01:00
Lennart Poettering
114400dfb3 core: change internal error code for masked units from EBADR to ESHUTDOWN
This commit changes the mapping of the BUS_ERROR_UNIT_MASKED error to ESHUTDOWN. This error is used whenever the
transaction engine is asked to operate on a masked unit. ESHUTDOWN is what is used for the similar case when the unit
file enable/disable logic hits a masked unit file, hence is a natural candidate to be used here too.

Background: before this patch both "job type not applicable" and "unit masked" where mapped to EBADR, which
transaction_add_job_and_dependencies() then checked for. It actually wanted to check exclusively for the former error
condition, not the latter but due to the same mapping this failed to work.

This patch semi-undoes an accidental change made in caffa4ef70, however restores the
error number to ESHUTDOWN instead of the original ENOSYS (for the reasons indicated above).

To make this easier to grok for the future, I added comments to explaining which error conditions are checked for.

Fixes: #2315
2016-02-09 20:28:58 +01:00
Lennart Poettering
bae687d885 Merge pull request #2561 from msekletar/virtio-blk-by-path
path_id: reintroduce by-path links for virtio block devices
2016-02-09 14:15:03 +01:00
Lennart Poettering
547725df89 Merge pull request #2559 from chaloulo/drop_monotonicity_check_from_journal_file
journal: Drop monotonicity check when appending to journal file
2016-02-09 13:52:28 +01:00
Lennart Poettering
68fd2e5015 Merge pull request #2557 from whot/hwdb-updates
hwdb: add Dell Lattitude E6320 pointing stick speed fix
2016-02-09 13:50:18 +01:00
Michal Sekletar
f073b1b3c0 path_id: reintroduce by-path links for virtio block devices
Enumeration of virtio buses is global and hence
non-deterministic. However, we are guaranteed there is never going to be
more than one virtio bus per parent PCI device. While populating
ID_PATH we simply skip virtio part of the syspath and we extend the path
using the sysname of the parent PCI device.

With this patch udev creates following by-path links for virtio-blk
device /dev/vda which contains two partitions.

ls -l /dev/disk/by-path/
total 0
lrwxrwxrwx 1 root root  9 Feb  9 10:47 virtio-pci-0000:00:05.0 -> ../../vda
lrwxrwxrwx 1 root root 10 Feb  9 10:47 virtio-pci-0000:00:05.0-part1 -> ../../vda1
lrwxrwxrwx 1 root root 10 Feb  9 10:47 virtio-pci-0000:00:05.0-part2 -> ../../vda2

See:
http://lists.linuxfoundation.org/pipermail/virtualization/2015-August/030328.html

Fixes #2501
2016-02-09 12:25:42 +01:00
Klearchos Chaloulos
ecb6105a1b journal: Drop monotonicity check when appending to journal file
Remove the check that triggers rotation of the journal file when the arriving log entry had a monotonic timestamp smaller that the previous log entry. This check causes unnecessary rotations when journal-remote was receiving from multiple senders, therefore monotonicity can not be guaranteed. Also, it does not offer any useful functionality for systemd-journald.
2016-02-09 12:14:54 +02:00
Peter Hutterer
d68c7dea38 hwdb: add Dell Lattitude E6320 pointing stick speed fix
https://bugzilla.redhat.com/show_bug.cgi?id=1200717
2016-02-09 17:42:55 +10:00
Lennart Poettering
70b65964d7 Merge pull request #2542 from 0xAX/get_ts_delta
time-util: cleanups
2016-02-09 00:23:47 +01:00
Lennart Poettering
41c24512cc Merge pull request #2547 from 0xAX/generalize-format-timestamp-internal
time-util: merge format_timestamp_internal() and format_timestamp_int…
2016-02-08 21:26:39 +01:00
Alexander Kuleshov
5d634ca8ce time-util: introduce usec_sub()
The dual_timestamp_from_realtime(), dual_timestamp_from_monotonic()
and dual_timestamp_from_boottime_or_monotonic() shares the same
code for comparison given ts with delta. Let's move it to the
separate inline function to prevent code duplication.
2016-02-09 01:15:17 +06:00
Alexander Kuleshov
0056086af6 time-util: merge format_timestamp_internal() and format_timestamp_internal_us()
The time_util.c provides format_timestamp_internal() and
format_timestamp_internal_us() functions for a timestamp formating. Both
functions are very similar and differ only in formats handling.

We can add additional boolean parameter to the format_timestamp_internal()
function which will represent is a format for us timestamp or not.
This allows us to get rid of format_timestamp_internal_us() that is prevent
code duplication.

We can remove format_timestamp_internal_us() safely, because it is static and
has no users outside of the time_util.c. New fourth parameter will be passed
inside of the format_timestamp(), format_timestamp_us() and etc, functions,
but the public API is not changed.
2016-02-09 00:15:40 +06:00
Lennart Poettering
9e7454e0e2 Merge pull request #2535 from PhillipSz/remove-exit-0
test: remove exit 0 at the end
2016-02-08 17:27:18 +01:00
Lennart Poettering
b89f8b2d44 Merge pull request #2533 from keszybz/read-only-seed
random-seed: provide nicer error message when unable to open file
2016-02-08 16:31:09 +01:00
Lennart Poettering
209b49ddb2 Merge pull request #2549 from rhatdan/journalctl
Journalctl command completion should show machines
2016-02-08 16:27:33 +01:00
Lennart Poettering
ab80ea105a Merge pull request #2550 from evverx/fix-457
tests: fix #457
2016-02-08 16:26:17 +01:00
Dan Walsh
2720e0c0f0 Journalctl command completion should show machines 2016-02-08 07:22:34 -05:00
Lennart Poettering
14f4532026 Merge pull request #2543 from keszybz/build-sys-and-man-fixes
Build sys and man fixes
2016-02-08 12:52:39 +01:00
Evgeny Vereshchagin
646048b40a tests: fix #457
There are some limits on XFS:
major_max=511
minor_max=262143
see https://github.com/torvalds/linux/blob/master/fs/xfs/xfs_iops.c

if (S_ISCHR(mode) || S_ISBLK(mode)) {
    if (unlikely(!sysv_valid_dev(rdev) || MAJOR(rdev) & ~0x1ff))
        return -EINVAL;
2016-02-08 11:23:18 +00:00
Zbigniew Jędrzejewski-Szmek
ef9fde5378 Merge pull request #2546 from torstehu/fix-typo3
treewide: fix typos and spacing
2016-02-07 09:45:13 -05:00
Zbigniew Jędrzejewski-Szmek
4121e255f2 Merge pull request #2536 from vcaputo/journal-misc-cleanups
journal: miscellaneous cleanups
2016-02-07 09:43:32 -05:00
Zbigniew Jędrzejewski-Szmek
dcd6ecf1e7 Merge pull request #2541 from mgorny/append-flags-fix
build-sys: Perform flag tests in context of existing flags
2016-02-07 09:33:49 -05:00
Torstein Husebø
1f133e0d53 treewide: fix typos and spacing 2016-02-07 15:31:04 +01:00
Zbigniew Jędrzejewski-Szmek
8edc2d22d8 random-seed: provide nicer error message when unable to open file
If /var is read-only, and the seed file does not exist, we would print
a misleading error message for ENOENT. Print both messages instead, to
make it easy to diagonose.

Also, treat the cases of missing seed file the same as empty seed file
and exit successfully. Initialize the return code properly.

Fixes https://github.com/systemd/systemd/issues/2530,
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813599.
2016-02-06 18:13:41 -05:00
Zbigniew Jędrzejewski-Szmek
8cd095cc27 shell-completion: fix header 2016-02-06 17:54:48 -05:00
Zbigniew Jędrzejewski-Szmek
89fc708c0a man: clarify that generators are run before /var
Just a clarification. At least systemd-openqa-generator from
openqa gets this wrong.
2016-02-06 17:54:48 -05:00
Zbigniew Jędrzejewski-Szmek
89a1675845 man/hostnamectl: refer to transient hostname as "fallback"
Saying it is the "default" is misleading, because it is almost
never used.
2016-02-06 17:54:48 -05:00
Zbigniew Jędrzejewski-Szmek
75f2310f21 man/hostname: remove obsolete text
All distribution-specific code was removed ages ago.
2016-02-06 17:54:48 -05:00
Zbigniew Jędrzejewski-Szmek
17163897d4 build-sys: simplify conditionals around shell completion files
Repeating those conditionals for every program is
annoying. Use a helper variable to avoid conditionals.

Also always add generated completion files to CLEANFILES.
2016-02-06 17:54:48 -05:00
Zbigniew Jędrzejewski-Szmek
4c32f2c96b build-sys: move CLEANFILES additions out from under HAVE_GNUEFI
It's better to always include them in 'make clean'.
It is also easier to read Makefile.am when less stuff is conditional.
2016-02-06 17:54:47 -05:00
Michał Górny
4c79662e25 build-sys: Perform flag tests in context to existing flags
Fix the CC_CHECK_FLAG_APPEND macro to test appended flags in context to
current flag values. Otherwise, it is possible to append flags colliding
with user's *FLAGS or even previously appended flags that will cause
the build to fail.
2016-02-06 14:57:46 +01:00
Lennart Poettering
d8889a887b Merge pull request #2534 from indrajitr/patch-1
Fix typo in rescue shell
2016-02-06 14:43:26 +01:00
Lennart Poettering
54b7f38fe8 Merge pull request #2525 from chaloulo/journal-remote-microhttp-max-memory-usage
journal-remote: decrease microhttpd memory limit
2016-02-06 14:40:32 +01:00
Lennart Poettering
b1f047d6ba Merge pull request #2540 from 0xAX/use-dual-timestamp-get-in-timeutil
time-util: use dual_timestamp_get()
2016-02-06 14:38:16 +01:00
Alexander Kuleshov
0345d25293 time-util: use dual_timestamp_get()
The time-util.c provides dual_timestamp_get() function for getting
realtime and monotonic timestamps. Let's use it instead of direct
realtime/monotonic calculation.
2016-02-06 18:26:05 +06:00
Vito Caputo
31981791c5 journal: add missing space to switch statement 2016-02-06 03:51:14 -08:00
Lennart Poettering
421180379f Merge pull request #2138 from stefwalter/journal-combine
Combine journal catalog entries with the same id
2016-02-06 11:30:05 +01:00
Vito Caputo
089ed40bf4 journal: remove template from open_journal args
None of the callers take advantage of this parameter, it's always NULL,
this is just a private helper function to simplify the call sites so
drop the template parameter altogether.  If a caller emerges later who
needs it, it can be restored.
2016-02-05 21:30:53 -08:00
Stef Walter
c059b62fe6 journal: Add test for merging journal entries 2016-02-05 17:07:01 +01:00
Stef Walter
9d85882aa8 journal: Refactor test-catalog importing tests
One function per test. Remove shared state between tests.
2016-02-05 17:07:01 +01:00
Stef Walter
dbae138dc1 journal: Combine journal catalog entries with the same id
Instead of discarding duplicate catalog entries, we now combine
them. This allows software or admins to add or override catalog
headers, or add additional text to the catalog message.
2016-02-05 17:06:59 +01:00
Vito Caputo
db87967e5b journal: move mmap() ENOMEM loop to function
Introduces mmap_try_harder()
2016-02-05 07:43:46 -08:00
Vito Caputo
90d222c190 journal: add asserts on f->(data|field)_hash_table
Functions dereferencing these members should assert their non-NULL state.
2016-02-05 07:43:46 -08:00
Vito Caputo
c88cc6af70 journal: add asserts for f->header
Just some additional asserts in functions dereferencing f->header.
2016-02-05 07:43:46 -08:00
Vito Caputo
6a49149028 journal: move window initialization to window_add 2016-02-05 07:43:42 -08:00
Phillip Sz
e3ceb75be3 test: remove exit 0 at the end
We don't need that at the end, as it will always exit with 0 if
everything is okey.
2016-02-05 11:38:58 +01:00
Indrajit Raychaudhuri
5e41590b70 Fix typo in rescue shell 2016-02-05 11:28:53 +05:30
Zbigniew Jędrzejewski-Szmek
784b22eef5 Merge pull request #2531 from whot/hwdb-updates
hwdb: add HP Pavilion dm4 axis corrections
2016-02-04 18:37:05 -05:00
Peter Hutterer
7f39a2bdda hwdb: add HP Pavilion dm4 axis corrections
https://bugs.freedesktop.org/show_bug.cgi?id=91615
2016-02-05 09:26:27 +10:00
Tom Gundersen
6448e16d21 Merge pull request #2524 from poettering/bag-of-stuff
Bag of stuff
2016-02-04 18:05:32 +01:00