nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
Florian Klink 08096e8ccf systemd: 245.5 -> 245.6
changes:

 - aa0cb635f1 (tag: v245.6) network: L2TP fix crash
 - 9774347b57 Fix typo.
 - 2cac801f0f stat-util: trivial empty_or_null() tweaks
 - b054e69bf9 Check ambient set against bounding set prior to applying ambient set
 - bed695375a udev: when the BSD lock on a block device is taken, don't complain
 - 66fcfdfde7 core: add forgotten return in error path
 - 05dd19fad3 shared/efi-loader: remove check that uses absolute tick value
 - 753a71ad1d gpt: include homed GPT partition type in well-known partition table
 - 3668722049 units: don't set PrivateNetwork= in systemd-homed.service
 - 2bca2d77d3 resolved-dns-query: remove dns_query_candidate_is_routable
 - a3f6020432 sd-network: fix inverted error message
 - a7a9fe3c93 network: allow empty assignment to PreferredLifetime=
 - 8df6fc1241 Update resolvectl zsh completion
 - c1a83277d0 shared: treat generator units as vendor units
 - 1f382d818d tree-wide: fix bad errno checks
 - 667c207683 bus-message: immediately reject messages with invalid type
 - 116a8eadb6 bus-message: fix negative offset with ~empty message
 - 4d5779d886 load-fragment: fix a typo
 - c8b6de003a NEWS: retroactively document Family=
 - cf6b8e6ec5 man: fix dir name in sysctl.d(5)
 - 6d009b7a25 journalctl,elsewhere: make sure --file=foo fails with sane error msg if foo is not readable
 - cf786ef164 makefs: log about OOM condition
 - 0b1839822f blockdev: propagate one more unexpected error
 - d78ce949d0 repart: don't insist on coming up on partition label ourselves
 - 9e1363fcc6 journal: fix dropping first record during upload to remote journal
 - 50cb4e418d meson: initialize time-epoch to reproducible builds compatible value
 - 76abe079b7 limit-util: quieten a very common debug message that is misleading
 - b3e484a3b1 shared: fix integer overflow in calendarspec
 - 0c29eea969 repart: suppress complaints about lack of BLKRRPART when operating on regular file
 - 3db52f5ed8 repart: explain when we exit early and don't do a thing
 - d99cba3aaa mount: introduce mount_is_nofail() helper
 - 7bc4bcea15 mount: default startup dependencies and default network ones are orthogonal
 - 7fe617fa53 mount: introduce mount_add_default_ordering_dependencies()
 - e1c091b6d4 automount: fix handling of default dependencies for automount units
 - ae05a137c9 mount: let pid1 alone handle the default dependencies for mount units
 - f1fb197176 mount: mount unit activated by automount unit should be only ordered against the automount unit
 - c9bcc69703 generator: don't generate device dependencies for extrinsic mounts
 - ebac09ea0a fstab-util: introduce fstab_is_extrinsic()
 - a20e4ea0ed device: drop refuse_after
 - 2799fffac1 man: drop some left-over mentions of StandardOutput=syslog
 - 144aff9c3b sd-netlink: remove unused RTNL_WQUEUE_MAX define
 - 34ca8df8e1 test: Add return 0 to main() function (even it is not strictly necessary)
 - 6e03f328a9 network: 'cur' variable cannot be null, so simplify code
 - 8d0c97f6ca tree-wide: Initialize _cleanup_ variables if needed
 - 4f174e49ae netlink: Fix assert condition on n_containers
 - 3905ce532c journald: Increase stdout buffer size sooner, when almost full
 - 5a37eb7c61 core: don't bind varlink socket if running in test mode
 - 33fff72ce6 pam_systemd: also print debug lines when ending a session
 - ba9af79ccb pam_systemd_home: use correct macro for converting ptr to fd
 - 6199235489 Fix misuse of PAM_PROMPT_ECHO_OFF in systemd-homed
 - c180a2c452 shared/ethtool-util: hush gcc warnings about array bounds
 - 1addba4aac core: fix compilation with gcc -O3
 - 9c46b97161 random-util: use ERRNO_IS_NOT_SUPPORTED() macro
 - d85f9093d2 tmpfiles: clarify that "!" lines are filtered before collisions are checked
 - 2fac966a5c man: mention the exclamation mark and minus sign literally, to make things searchable
 - 4f61be3373 man: clarify that exit status name mappings are unaffected by SuccessExitStatus=
 - b747d74a41 seccomp-util: add new syscalls from kernel 5.6 to syscall filter table
 - c30d8caf8b tree-wide: Replace assert() by assert_se() when there is side effect
 - b6e8e3be7e networkctl: use uint64_t for link speed throughout
 - be66ce6089 tree-wide: use CMSG_SPACE() (and not CMSG_LEN()) to allocate control buffers
 - 1cb197798a man: suffix pam options with "=" where arg is required too
 - a5fe01d3da test: Use assert_se() where variables are only checked by assert
 - 6960efd198 tree-wide: Fix, replace assert() by assert_se() when there is side effect
 - 93c1b03074 tree-wide: Mark as _unused_ variables that are only used in assert()
 - c7679d7a9f tree-wide: Workaround -Wnonnull GCC bug
 - 073b257fd7 man: bring example PAM snippet of pam_systemd and pam_systemd_home back in sync
 - 855291a81c man: highlight relevant lines in pam_systemd_home.so example PAM snippet
 - f89ad7c0fd login: include pam_systemd_home.so in the default PAM snippet we ship for user@.service
 - 9357f9466f test: Skip test-boot-timestamps on permission denied
 - cad4ebe14e sysusers: be extra careful when locking accounts
 - 551e6f233a shared/install: print name of offending file in error
 - c6a2e51232 systemctl: fix --root support in querying presets
 - 6f1eedbfdd systemctl: fix hint when 'systemctl help' is given
 - 925521df7c shared/unit-file: fix resolution of absoulute symlinks with --root
 - 756ba362e8 man: mention that ProtectSystem= also takes care of /efi
 - 4f77cf43b5 man: systemd.service: systemd-analyze exit-codes -> exit-status
 - 7c6ea7a053 man: expand on the star…end/repetition time expressions
 - e06b940792 calendarspec: be more graceful with two kinds of calendar expressions
 - f3dd0b476d calendarspec: minor simplification
 - 3581c16d56 shutdown: fix spacing in shutdown error message
 - 9556255349 nspawn: mount custom paths before writing to /etc
 - 37447b7e78 repart: fix partition maximum size segfault
 - 7f231ba503 link: Add units and fix typo in (Rx|Tx)BufferSize= manpage. Clean up the implementation slightly
 - e75d2cdb0b main: bump RLIMIT_MEMLOCK by physical RAM size
 - e16b9a1e31 nspawn: be more careful with creating/chowning directories to overmount
 - 765d184a69 homectl: say "home area" in more places
 - c11bff4fa7 userdbctl: make --help fit in 80 columns
 - 0e56c2ef3f shell-completion/zsh: update systemd-analyze completions
 - 2bb580f994 zsh: fix disable/enable completion
 - 607a19a309 cgroup-util: check for SYSFS_MAGIC when detecting cgroup format
 - ddb3c38efc stat-util: no need to open a file to check fs type
 - bd8842304c sysusers,tmpfiles: always mention error when failing to replace specifiers
 - bdea9b65d2 sysusers: add accidentally forgotten 'return'
 - 17b059774d man: document binfmt's new --unregister switch
 - 560380d8ec binfmt: also unregister binfmt entries from unit
 - 80835d9c51 binfmt: modernize code a bit
 - a1745741b8 shutdown: unregister all binfmt_misc entries before entering shutdown loop
 - b637445950 shared: add common helper for unregistering all binfmt entries
 - 0215625e99 home: fix strv NUL termination
 - 038988baa1 networkd: don't do lldp rx nor tx on bond devices
 - 9512d576d9 sd-bus: Fix typo in sd_bus_message_append_array docs
 - 63cef71dd0 shared: add NULL callback check in one more place
 - 6b91ca22a2 core: fix unused variable warning when !HAVE_SECCOMP
 - f7c1c79c57 udev: prepare memory for extra NUL termination for NULSTR
 - 69e0ef0d99 tree-wide: use recvmsg_safe() at various places
 - cd0a84d4e9 socket-util: add recvmsg_safe() wrapper that handles MSG_CTRUNC
 - 2bb48c704b sd-bus: work around ubsan warning
 - c147bba1fb shared: Don't try calling NULL callback in bus_wait_for_units_clear
 - f907491463 run: don't wait for start job to complete when running interactively anyway
 - d3d1550a5d man: Fix typo "multiplied with" -> "multiplied by"
 - ae5a9f27c5 core: make sure we don't get confused when setting TERM for a tty fd
 - a07d3eaf76 man: document that VirtualEthernetExtra= has nothing to do with Bridge=
 - 35fe81078e core: add debug log when a job in the activation queue is not runnable
 - a0cd882be8 core: add log_get_max_level check optimization in log_unit_full
 - 2a6ad1093c util: return the correct correct wd from inotify helpers
 - 9ec244c5c1 core: minor error code handling fixes
 - a799283c91 man: document how to get the boot menu with zero time-out
 - 7263e86c8d resolved: return org.freedesktop.resolve1.DnsError.NXDOMAIN on LLMNR resolution failure
 - 6eab4c2b3e man: use manpages.ubuntu.com for resolvconf(8) link
 - 75ccec5cde man: add a note that resolvconf updates /etc/resolv.conf in specific circumstances
 - 3e3a31743a resolvectl: fix indentation of hexdump'ed packets
 - 6576058fab journald: add configuration option for enabling/disabling audit during journald startup
 - 52c5909f15 man/systemd-service: clarify env variable expansion
 - ac08df59c0 resolved: fix typo in an unused function and add comment
2020-06-14 14:26:39 +02:00

33 lines
968 B
Diff

From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jul 2016 02:47:13 +0300
Subject: [PATCH 08/18] Fix hwdb paths
Patch by vcunat.
---
src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index b3febdbb31..eba00a5bc7 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
}
static const char hwdb_bin_paths[] =
- "/etc/systemd/hwdb/hwdb.bin\0"
"/etc/udev/hwdb.bin\0"
- "/usr/lib/systemd/hwdb/hwdb.bin\0"
-#if HAVE_SPLIT_USR
- "/lib/systemd/hwdb/hwdb.bin\0"
-#endif
- UDEVLIBEXECDIR "/hwdb.bin\0";
+ ;
_public_ int sd_hwdb_new(sd_hwdb **ret) {
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
--
2.26.2