summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-09core: change internal error code for masked units from EBADR to ESHUTDOWNLennart Poettering
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 caffa4ef700fdd0eadd6c0b2ef9925611672a1bc, 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-09Merge pull request #2561 from msekletar/virtio-blk-by-pathLennart Poettering
path_id: reintroduce by-path links for virtio block devices
2016-02-09Merge pull request #2559 from chaloulo/drop_monotonicity_check_from_journal_fileLennart Poettering
journal: Drop monotonicity check when appending to journal file
2016-02-09Merge pull request #2557 from whot/hwdb-updatesLennart Poettering
hwdb: add Dell Lattitude E6320 pointing stick speed fix
2016-02-09path_id: reintroduce by-path links for virtio block devicesMichal Sekletar
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-09journal: Drop monotonicity check when appending to journal fileKlearchos Chaloulos
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-09hwdb: add Dell Lattitude E6320 pointing stick speed fixPeter Hutterer
https://bugzilla.redhat.com/show_bug.cgi?id=1200717
2016-02-09Merge pull request #2542 from 0xAX/get_ts_deltaLennart Poettering
time-util: cleanups
2016-02-08Merge pull request #2547 from 0xAX/generalize-format-timestamp-internalLennart Poettering
time-util: merge format_timestamp_internal() and format_timestamp_int…
2016-02-09time-util: introduce usec_sub()Alexander Kuleshov
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-09time-util: merge format_timestamp_internal() and format_timestamp_internal_us()Alexander Kuleshov
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-08Merge pull request #2535 from PhillipSz/remove-exit-0Lennart Poettering
test: remove exit 0 at the end
2016-02-08Merge pull request #2533 from keszybz/read-only-seedLennart Poettering
random-seed: provide nicer error message when unable to open file
2016-02-08Merge pull request #2549 from rhatdan/journalctlLennart Poettering
Journalctl command completion should show machines
2016-02-08Merge pull request #2550 from evverx/fix-457Lennart Poettering
tests: fix #457
2016-02-08Journalctl command completion should show machinesDan Walsh
2016-02-08Merge pull request #2543 from keszybz/build-sys-and-man-fixesLennart Poettering
Build sys and man fixes
2016-02-08tests: fix #457Evgeny Vereshchagin
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-07Merge pull request #2546 from torstehu/fix-typo3Zbigniew Jędrzejewski-Szmek
treewide: fix typos and spacing
2016-02-07Merge pull request #2536 from vcaputo/journal-misc-cleanupsZbigniew Jędrzejewski-Szmek
journal: miscellaneous cleanups
2016-02-07Merge pull request #2541 from mgorny/append-flags-fixZbigniew Jędrzejewski-Szmek
build-sys: Perform flag tests in context of existing flags
2016-02-07treewide: fix typos and spacingTorstein Husebø
2016-02-06random-seed: provide nicer error message when unable to open fileZbigniew Jędrzejewski-Szmek
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-06shell-completion: fix headerZbigniew Jędrzejewski-Szmek
2016-02-06man: clarify that generators are run before /varZbigniew Jędrzejewski-Szmek
Just a clarification. At least systemd-openqa-generator from openqa gets this wrong.
2016-02-06man/hostnamectl: refer to transient hostname as "fallback"Zbigniew Jędrzejewski-Szmek
Saying it is the "default" is misleading, because it is almost never used.
2016-02-06man/hostname: remove obsolete textZbigniew Jędrzejewski-Szmek
All distribution-specific code was removed ages ago.
2016-02-06build-sys: simplify conditionals around shell completion filesZbigniew Jędrzejewski-Szmek
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-06build-sys: move CLEANFILES additions out from under HAVE_GNUEFIZbigniew Jędrzejewski-Szmek
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-06build-sys: Perform flag tests in context to existing flagsMichał Górny
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-06Merge pull request #2534 from indrajitr/patch-1Lennart Poettering
Fix typo in rescue shell
2016-02-06Merge pull request #2525 from chaloulo/journal-remote-microhttp-max-memory-usageLennart Poettering
journal-remote: decrease microhttpd memory limit
2016-02-06Merge pull request #2540 from 0xAX/use-dual-timestamp-get-in-timeutilLennart Poettering
time-util: use dual_timestamp_get()
2016-02-06time-util: use dual_timestamp_get()Alexander Kuleshov
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-06journal: add missing space to switch statementVito Caputo
2016-02-06Merge pull request #2138 from stefwalter/journal-combineLennart Poettering
Combine journal catalog entries with the same id
2016-02-05journal: remove template from open_journal argsVito Caputo
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-05journal: Add test for merging journal entriesStef Walter
2016-02-05journal: Refactor test-catalog importing testsStef Walter
One function per test. Remove shared state between tests.
2016-02-05journal: Combine journal catalog entries with the same idStef Walter
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-05journal: move mmap() ENOMEM loop to functionVito Caputo
Introduces mmap_try_harder()
2016-02-05journal: add asserts on f->(data|field)_hash_tableVito Caputo
Functions dereferencing these members should assert their non-NULL state.
2016-02-05journal: add asserts for f->headerVito Caputo
Just some additional asserts in functions dereferencing f->header.
2016-02-05journal: move window initialization to window_addVito Caputo
2016-02-05test: remove exit 0 at the endPhillip Sz
We don't need that at the end, as it will always exit with 0 if everything is okey.
2016-02-05Fix typo in rescue shellIndrajit Raychaudhuri
2016-02-04Merge pull request #2531 from whot/hwdb-updatesZbigniew Jędrzejewski-Szmek
hwdb: add HP Pavilion dm4 axis corrections
2016-02-05hwdb: add HP Pavilion dm4 axis correctionsPeter Hutterer
https://bugs.freedesktop.org/show_bug.cgi?id=91615
2016-02-04Merge pull request #2524 from poettering/bag-of-stuffTom Gundersen
Bag of stuff
2016-02-04journal-remote: decrease microhttpd memory limitKlearchos Chaloulos
Set the MHD_OPTION_CONNECTION_MEMORY_LIMIT to 128KB. The precious value was DATA_SIZE_MAX, which was defined as 1024*1024*768. This caused journal-remote to allocate 756MB for each journal-upload connection, thus exhausting the available memory.