Timo Schlüßler [Mon, 13 Jan 2020 09:26:58 +0000 (09:26 +0000)]
journalctl: Correctly handle combination of --reverse and --lines (fixes #1596)
Timo Schlüßler [Mon, 13 Jan 2020 09:09:45 +0000 (09:09 +0000)]
journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse
Lennart Poettering [Mon, 13 Jan 2020 15:47:15 +0000 (16:47 +0100)]
Merge pull request #14532 from poettering/namespace-dynamic-user-fix
Make DynamicUser=1 work in a userns container
Zbigniew Jędrzejewski-Szmek [Mon, 13 Jan 2020 14:35:54 +0000 (15:35 +0100)]
Merge pull request #14553 from poettering/man-mkdir
man: small man page fixes
Lennart Poettering [Mon, 13 Jan 2020 10:45:48 +0000 (11:45 +0100)]
Merge pull request #14549 from keszybz/portability-and-stability
Portability and stability
Lennart Poettering [Mon, 13 Jan 2020 10:23:14 +0000 (11:23 +0100)]
man: we support bind mounting regular files too
Let's be precise here: we accept non-directories here too, even though
we create things as directories if we find the Where= not to exist.
Lennart Poettering [Mon, 13 Jan 2020 10:22:11 +0000 (11:22 +0100)]
man: document that we mkdir() on What= in .mount units too
As suggested here:
https://lists.freedesktop.org/archives/systemd-devel/2020-January/043914.html
Zbigniew Jędrzejewski-Szmek [Sun, 12 Jan 2020 18:03:32 +0000 (19:03 +0100)]
docs: say that various cli progs are independent of pid1
Zbigniew Jędrzejewski-Szmek [Sun, 12 Jan 2020 17:32:40 +0000 (18:32 +0100)]
docs: say that dbus api is stable (but list various caveats)
I removed the part about sysv compat, because that has already been removed and
we don't make any use of conditional dbus interfaces afaict.
Zbigniew Jędrzejewski-Szmek [Sun, 12 Jan 2020 17:17:50 +0000 (18:17 +0100)]
docs: say that all documented programs in $PATH are stable
Zbigniew Jędrzejewski-Szmek [Sat, 11 Jan 2020 18:34:29 +0000 (19:34 +0100)]
docs: import "interface stability promise"
In the wiki, this was a separate page. I don't think this split is useful,
since the information about what is stable and what not seems randomly split
between the two pages.
Links are adjusted for our own pages. Some external links to gentoo and other
projects seem to be broken, but it's a chore to fix them.
Yu Watanabe [Sun, 12 Jan 2020 07:01:25 +0000 (16:01 +0900)]
man: XxxRate= are in bps
Zbigniew Jędrzejewski-Szmek [Sat, 11 Jan 2020 18:20:35 +0000 (19:20 +0100)]
docs/stability: relax the stance on accepting patches a bit
Instead of saying that patches for portability are not accepted, say that this
is decided case-by-case. This is what happens in practice, and we tend to
discuss each patch on its own merits.
Some sentences are reworded a bit where they sound awkward.
Zbigniew Jędrzejewski-Szmek [Sat, 11 Jan 2020 17:47:26 +0000 (18:47 +0100)]
docs: import stability chart from wiki
rhn [Fri, 10 Jan 2020 23:08:00 +0000 (23:08 +0000)]
nspawn: Correct "container" to "host" MAC setting message
Lennart Poettering [Fri, 10 Jan 2020 16:06:16 +0000 (17:06 +0100)]
Merge pull request #14533 from poettering/swap-prio-fixes
Fix Priority= parsing in .swap units
Lennart Poettering [Fri, 10 Jan 2020 16:03:01 +0000 (17:03 +0100)]
Merge pull request #14508 from poettering/namespace-ro-fix
core: be nicer to read-only images
Lennart Poettering [Fri, 10 Jan 2020 15:40:31 +0000 (16:40 +0100)]
Merge pull request #14538 from yuwata/xyzctl-full
use table_set_width(table, 0) if --full is specified
Zbigniew Jędrzejewski-Szmek [Thu, 19 Dec 2019 09:15:08 +0000 (10:15 +0100)]
hwdb: make comment more precise
Based on https://github.com/systemd/systemd/pull/14296#issuecomment-
567159538.
Yu Watanabe [Fri, 10 Jan 2020 10:17:26 +0000 (19:17 +0900)]
machinectl: do not truncate addresses when --full is specified
Yu Watanabe [Fri, 10 Jan 2020 09:23:24 +0000 (18:23 +0900)]
tree-wide: use table_log_add_error()
Yu Watanabe [Fri, 10 Jan 2020 09:23:23 +0000 (18:23 +0900)]
portablectl: optimize table creation
Yu Watanabe [Fri, 10 Jan 2020 09:23:22 +0000 (18:23 +0900)]
machinectl: optimize table creation
Yu Watanabe [Fri, 10 Jan 2020 09:23:21 +0000 (18:23 +0900)]
analyze: optimize table creation by using table_add_many()
Yu Watanabe [Fri, 10 Jan 2020 09:23:20 +0000 (18:23 +0900)]
format-table: add table_log_add_error()
Anita Zhang [Fri, 10 Jan 2020 08:29:11 +0000 (00:29 -0800)]
initctl: (void)ify epoll_ctl()
CID 996298
Anita Zhang [Fri, 10 Jan 2020 07:57:39 +0000 (23:57 -0800)]
Merge pull request #14534 from poettering/cgroup-sibling-fix
core: fix re-realization of cgroup siblings
Yu Watanabe [Fri, 10 Jan 2020 06:44:44 +0000 (15:44 +0900)]
Merge pull request #13927 from ddstreet/ll_no
networkd: set addr_gen_mode and check for tentative ipv6ll before dro…
Yu Watanabe [Fri, 10 Jan 2020 03:29:02 +0000 (12:29 +0900)]
bash-completion: do not ellipsize machine name
Yu Watanabe [Fri, 10 Jan 2020 03:24:51 +0000 (12:24 +0900)]
machinectl: do not ellipsize table when --full is specified
Yu Watanabe [Fri, 10 Jan 2020 03:22:08 +0000 (12:22 +0900)]
bash-completion: busctrl: support --full command line option
Yu Watanabe [Fri, 10 Jan 2020 03:19:47 +0000 (12:19 +0900)]
busctl: introduce --full command line option
Yu Watanabe [Fri, 10 Jan 2020 03:13:12 +0000 (12:13 +0900)]
bash-completion: networkctl: do not show ellipsized link name
Yu Watanabe [Fri, 10 Jan 2020 03:12:00 +0000 (12:12 +0900)]
networkctl: set table width 0 when --full is specified
Yu Watanabe [Fri, 10 Jan 2020 03:07:28 +0000 (12:07 +0900)]
systemd-mount: add --full command line option
Lennart Poettering [Thu, 9 Jan 2020 17:24:00 +0000 (18:24 +0100)]
format-table: allow forcing arbitrary width tables
Useful for implementing systemctl's --full.
See #14470
Anita Zhang [Fri, 10 Jan 2020 01:10:48 +0000 (17:10 -0800)]
Merge pull request #14527 from poettering/socket-state-fix
core: propagate service state to socket in more load states
Dan Streetman [Wed, 8 Jan 2020 12:32:19 +0000 (07:32 -0500)]
test-network: simplify wait_online() by calling wait_operstate()
The wait_operstate() function now rechecks the condition for a timeout,
so the wait_online() function can simply call it to check for the
setup_state.
Dan Streetman [Wed, 8 Jan 2020 12:28:29 +0000 (07:28 -0500)]
test-network: convert wait_operstate() to recheck condition for timeout seconds
Failing after a single check leads to extra sleeps scattered through
test cases, and can also lead to false failures. Instead perform a
recheck for a number of seconds until the state matches, and fail only
if the timeout is exceeded.
This allows removing all the manual sleeps in the testcases.
Dan Streetman [Wed, 8 Jan 2020 12:25:16 +0000 (07:25 -0500)]
test-network: rename check_operstate() to wait_operstate()
Rename only, no functional change; this makes following patches easier
to read.
Dan Streetman [Mon, 6 Jan 2020 21:35:28 +0000 (16:35 -0500)]
network: drop foreign config after addr_gen_mode has been set
Interfaces may come up at any time, even during our initialization of
them, for various reasons; e.g. the kernel will raise VLAN when its
parent is raised; or we will raise an interface if configured with
BindCarrier and its associated interfaces come up.
When LinkLocalAddressing has been disabled for ipv6, we disable
addr_gen_mode in the kernel, so it will not automatically create a
ipv6ll address when the interface is raised. However, we currently
drop all foreign addresses before disabling addr_gen_mode.
If the link has been up for a long time, then its kernel-created ipv6ll
address will be correctly dropped. If the link is down, and stays
down until we raise it after finishing configuration, the addr_gen_mode
setting will be disabled when the interface is raised and the kernel
will not create any ipv6ll address.
However, if the interface is raised after dropping foreign config,
but before we have disabled addr_gen_mode, the kernel will create a
ipv6ll tentative address that will eventually finish DAD and become a
working ipv6ll address, even though we have been configured to disable
ipv6ll.
Moving our call to drop foreign addresses to after we have successfully
set addr_gen_mode closes this window; after we disable addr_gen_mode,
we can safely remove foreign ipv6ll addresses (including tentative ones)
and be sure that the kernel will not create any more.
Fixes: #13882.
Dan Streetman [Sat, 4 Jan 2020 23:41:18 +0000 (18:41 -0500)]
network: if ipv6ll is disabled, enumerate tentative ipv6 addrs before dropping foreign addrs
The kernel will create an ipv6ll tentative address immediately when an
interface is raised if addr_gen_mode is not disabled; and, the kernel does
not notify netlink listeners about any tentative addresses. So it's
possible for an interface to contain tentative ipv6 link-local address(es)
that networkd doesn't know about when all foreign addresses are dropped.
In this case, networkd is later notified about the new ipv6ll address(es)
after they finish DAD and are no longer tentative; but since that's after
networkd has already dropped foreign addresses, they are incorrectly left
on the interface.
Dan Streetman [Thu, 19 Dec 2019 18:17:45 +0000 (13:17 -0500)]
network: add link->setting_genmode flag
Similar to the link->setting_mtu flag, this delays continued configuration
until after the genmode has been successfully set; this is important
because we do not want networkd to raise the interface before the genmode
has been set, as if we're disabling the genmode, raising the interface
before we have successfully disabled the genmode will result in the kernel
creating a ipv6ll address, even though we don't want that.
Dan Streetman [Thu, 19 Dec 2019 18:14:42 +0000 (13:14 -0500)]
network: rename linux_configure_after_setting_mtu() to linux_configure_continue()
This is a simple rename to make the function name more generic;
the next commit expands its usage to more than only the mtu handler.
HATAYAMA Daisuke [Wed, 18 Dec 2019 03:01:42 +0000 (22:01 -0500)]
man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH
There are sometimes users who put unit files in a location that is inaccessible
when systemd starts although they are not found and thus not started because
the corresponding mount units have not activated yet.
There is already a warning for such issue in man 8 systemctl:
link PATH...
...<snip>...
The file system where
the linked unit files are located must be accessible
when systemd is started (e.g. anything underneath /home
or /var is not allowed, unless those directories are
located on the root file system).
However, it looks that it's difficult to find the warning because introductory
users typically doesn't know systemctl link.
Although there is a description in UNIT FILE LOAD PATH pointing to systemctl
link, symlink is now not explicitly mentioned there and thus users doesn't
easily get aware of they should read it.
To deal with this, let's describe "symlink" and "systemctl link" more
explicitly in UNIT FILE LOAD PATH.
Lennart Poettering [Thu, 9 Jan 2020 16:30:31 +0000 (17:30 +0100)]
core: fix re-realization of cgroup siblings
This is a fix-up for
eef85c4a3f8054d29383a176f6cebd1ef3a15b9a which
broke this.
Tracked down by @w-simon
Fixes: #14453
Lennart Poettering [Thu, 9 Jan 2020 16:04:25 +0000 (17:04 +0100)]
core: set error value correctly
Lennart Poettering [Thu, 9 Jan 2020 16:03:57 +0000 (17:03 +0100)]
core: use unit-based logging instead of generic logging where appropriate
Lennart Poettering [Thu, 9 Jan 2020 16:02:56 +0000 (17:02 +0100)]
core: initialize priority_set when parsing swap unit files
Fixes: #14524
Lennart Poettering [Thu, 9 Jan 2020 16:01:46 +0000 (17:01 +0100)]
core: no need to initialize swap structure fields if all zeroes anyway
Lennart Poettering [Thu, 9 Jan 2020 16:01:14 +0000 (17:01 +0100)]
core: expose swap priority value via dbus only if it is set
Lennart Poettering [Thu, 9 Jan 2020 14:47:24 +0000 (15:47 +0100)]
Merge pull request #14525 from yuwata/mount-use-format-table
systemd-mount: use format-table.[ch]
Yu Watanabe [Thu, 9 Jan 2020 11:21:28 +0000 (20:21 +0900)]
bash-completion: networkctl: support --full and --lines
Lennart Poettering [Thu, 9 Jan 2020 11:01:45 +0000 (12:01 +0100)]
core: be more restrictive on the dependency types we allow to be created transiently
We should allow the ones that the [Unit] section of regular unit files
may accet, but no other, in particular not the internal deps we
synthesize as reverse of explicitly configured ones, such was WantedBy=.
Fixes: #14251
Yu Watanabe [Thu, 9 Jan 2020 06:41:21 +0000 (15:41 +0900)]
timedatectl: use format-table.[ch]
Lennart Poettering [Thu, 9 Jan 2020 14:06:06 +0000 (15:06 +0100)]
core: make sure we use the correct mount flag when re-mounting bind mounts
When in a userns environment we cannot take away per-mount point flags
set on a mount point that was passed to us. Hence we need to be careful
to always check the actual mount flags in place and manipulate only
those flags of them that we actually want to change and not reset more
as side-effect.
We mostly got this right already in
bind_remount_recursive_with_mountinfo(), but didn't in the simpler
bind_remount_one_with_mountinfo(). Catch up.
(The old code assumed that the MountEntry.flags field contained the
right flag settings, but it actually doesn't for new mounts we just
established as for those mount() establishes the initial flags for us,
and we have to read them back to figure out which ones the kernel
picked.)
Fixes: #13622
Lennart Poettering [Thu, 9 Jan 2020 14:05:55 +0000 (15:05 +0100)]
mount-util: line break overly long function prototypes
Lennart Poettering [Thu, 9 Jan 2020 13:59:41 +0000 (14:59 +0100)]
mount-util: clean up get_mount_flags()
This cleans up the function in multiple ways:
- change order of parameters to follow our usualy system of putting
return parameters last
- rename return parameter "ret" as we usually do
- don't initialize local variables we override immediately anyway
- downgrade log messages to LOG_DEBUG (since we don't log about any
other errors here above LOG_DEBUG, as this is mostly an "API"-style
function)
- handle that mnt_fs_get_vfs_options() may return NULL (according to
docs)
- manually map the ST_xyz to MS_xyz flags on statvfs(), because while
they are mostly the same, they aren't entirely the same, MS_RELATIME and
ST_RELATIME are defined differently (sad!)
Lennart Poettering [Thu, 9 Jan 2020 13:55:15 +0000 (14:55 +0100)]
mount-util: don't mask away MS_RDONLY twice
We have the flags mask for that, and if callers really wanted us to mask
this away, then they should pass the correct mask.
Lennart Poettering [Thu, 9 Jan 2020 13:53:36 +0000 (14:53 +0100)]
mount-util: rename cleaned → simplified, because that's what we actually did here
Yu Watanabe [Thu, 9 Jan 2020 05:49:11 +0000 (14:49 +0900)]
systemd-mount: add --no-legend command line option
Yu Watanabe [Thu, 9 Jan 2020 05:39:35 +0000 (14:39 +0900)]
systemd-mount: use format-table.[ch]
Yu Watanabe [Thu, 9 Jan 2020 11:14:30 +0000 (20:14 +0900)]
format-table: introduce TABLE_PATH
Lennart Poettering [Thu, 9 Jan 2020 10:51:40 +0000 (11:51 +0100)]
core: propagate service state to socket in more load states
It makes sense to filter state changes for some load states that
shouldn't happen, but the common cases should be accepted, because they
might happen during runtime when "systemctl daemon-reload" is issued and
unit files changed state in between. Otherwise we lose events.
Fixes: #4708
Thomas Schmitt [Mon, 6 Jan 2020 07:10:32 +0000 (15:10 +0800)]
udev: don't import parent ID_FS_ data on partitions
When probing partitions, we inherit important information from the parent
disk device such as ID_MODEL, and usage of such properties is seen to
be acceptable and well established.
However, we need to exclude filesystem information from the properties
that get inherited. Information about the device content should not be
passed on in this way.
For example, Linux distro install media commonly uses an ISO filesystem
plus a partition table. The ISO filesystem is detected on the main disk
device, but we should not pass down those details to the partitions,
some or all of which may be pointing at storage areas completely distinct
from the ISO filesystem.
This is particularly problematic when adding new partitions on media
set up in this way (since the new partitions are then reported to contain
the parent device's ISO filesystem), or when dealing with more unusual
hybrid ISO layouts. The inaccuracy of information here inversely affects
users of blkid and udev's persistent storage symlinks.
Exclude ID_FS_* properties from the inheritance chain to avoid these
problems.
Fixes: #14408
Lennart Poettering [Tue, 7 Jan 2020 15:56:05 +0000 (16:56 +0100)]
core: when we cannot open an image file for write, try read-only
Closes: #14442
Lennart Poettering [Tue, 7 Jan 2020 15:25:11 +0000 (16:25 +0100)]
namespace: tweak checks whether we can mount image read-only
So far we set up a loopback file read-only iff ProtectSystem= and
ProtectHome= both where set to values that mark these dirs read-only.
Let's extend that and also be happy if /home and the root dir are marked
read-only by some other means.
Fixes: #14442
Lennart Poettering [Tue, 7 Jan 2020 15:42:25 +0000 (16:42 +0100)]
install: use path_strv_contains() where appropriate
Lennart Poettering [Wed, 8 Jan 2020 11:23:57 +0000 (12:23 +0100)]
path-util: express PATH_IN_SET() through path_strv_contains()
Lennart Poettering [Tue, 7 Jan 2020 15:24:33 +0000 (16:24 +0100)]
path-util: introduce path_strv_contains() helper
it's like strv_contains() but uses path_equal() rather than streq() to
compare strings.
Yu Watanabe [Thu, 9 Jan 2020 03:50:11 +0000 (12:50 +0900)]
Merge pull request #14523 from keszybz/refactorings
Refactorings inspired by recent pull requests
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 15:22:23 +0000 (16:22 +0100)]
sd-event: use _cleanup_ in one more place
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 15:20:20 +0000 (16:20 +0100)]
sd-event: use RAII for struct epoll_event
Inspired by #14353.
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 11:08:48 +0000 (12:08 +0100)]
network: use automatic stack allocation and structured init
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 11:02:01 +0000 (12:02 +0100)]
network: do not require ethtool_get_permanent_macaddr() to get an fd
Lennart Poettering [Wed, 8 Jan 2020 11:12:16 +0000 (12:12 +0100)]
test: minor typo fix
As pointed out on: https://github.com/systemd/systemd/pull/14465#discussion_r364152064
Lennart Poettering [Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)]
Merge pull request #14448 from yuwata/network-permanent-mac-address
network, udev: support permanent mac address
Lennart Poettering [Wed, 8 Jan 2020 13:26:33 +0000 (14:26 +0100)]
Merge pull request #14518 from keszybz/interface-text
doc: tweak grammar in CONTAINER_INTERFACE description
Lennart Poettering [Wed, 8 Jan 2020 13:26:17 +0000 (14:26 +0100)]
Merge pull request #14511 from keszybz/sleep-check-rework
Sleep check rework
Lennart Poettering [Wed, 8 Jan 2020 11:18:38 +0000 (12:18 +0100)]
Merge pull request #14512 from poettering/root-image-devices
Make RootImage= work reliable with DeviceAllow= in the mix
Frantisek Sumsal [Wed, 8 Jan 2020 09:44:10 +0000 (10:44 +0100)]
test: pin meson to 0.52.1 for fuzzit/fuzzbuzz
Latest meson doesn't work with older python 3.5, which is present on
Ubuntu 16.04. Let's pin in to the latest working version (0.52.1) until
we properly bump all necessary Ubuntu images to 18.04.
See: https://github.com/mesonbuild/meson/issues/6427
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 10:55:07 +0000 (11:55 +0100)]
network: rename *fd to *ethtool_fd
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 10:43:09 +0000 (11:43 +0100)]
man: use xi:include to avoid duplication
... and fix some unwarranted discrepancies between the two man pages.
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 10:06:46 +0000 (11:06 +0100)]
Merge pull request #14465 from poettering/setprio-rework
When Nice= is used, clamp to RLIMIT_NICE
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 09:49:39 +0000 (10:49 +0100)]
Merge pull request #14488 from yuwata/networkctl-show-logs
networkctl: status command also shows logs of networkd
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 09:39:44 +0000 (10:39 +0100)]
man: fix option name
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 09:29:10 +0000 (10:29 +0100)]
doc: tweak grammar in CONTAINER_INTERFACE description
The only non-stylistic change is to replace descriptions of how we are
encouraging people to use PrivateTmp= and such, because now they are widely
used.
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 08:58:57 +0000 (09:58 +0100)]
Merge pull request #14494 from poettering/container-interface
Let's import the container interface description text from the fdo wiki
Yu Watanabe [Mon, 7 Jan 2019 11:16:20 +0000 (20:16 +0900)]
networkctl: show permanent mac address if it is not used now
Yu Watanabe [Mon, 7 Jan 2019 11:16:19 +0000 (20:16 +0900)]
network, udev: introduce PermanentMACAddress= setting in [Match] section
Closes #13983.
ezst036 [Wed, 8 Jan 2020 00:47:15 +0000 (19:47 -0500)]
Support Plugable UD-PRO8 dock
Add support for Plugable Pro8 docking station for auto-configuring seat
Yu Watanabe [Mon, 7 Jan 2019 11:16:18 +0000 (20:16 +0900)]
ethtool: introduce ethtool_get_permanent_macaddr()
Will be used in later commits.
Lennart Poettering [Tue, 7 Jan 2020 16:21:24 +0000 (17:21 +0100)]
gpt-auto: don't assume XBOOTLDR is vfat
Let's not assume "umask=" is a valid mount option for XBOOTLDR
partitions unconditionally.
Fixes: #14165
Robert Scheck [Wed, 8 Jan 2020 01:36:07 +0000 (02:36 +0100)]
network, meson: allow statically linked build
Build option "link-networkd-shared" to build a statically linked
systemd-networkd by using
-Dlink-udev-shared=false -Dlink-networkd-shared=false
on systems with full systemd stack except systemd-networkd, such
as RHEL/CentOS 8.
Zbigniew Jędrzejewski-Szmek [Wed, 8 Jan 2020 08:46:49 +0000 (09:46 +0100)]
Merge pull request #14510 from poettering/net-naming-scheme-fixlets
some net naming scheme documentation fixes
Daniel Shahaf [Tue, 7 Jan 2020 20:17:26 +0000 (20:17 +0000)]
zsh: Complete systemctl subcommands in separate tags
Fixes #14422
Zbigniew Jędrzejewski-Szmek [Tue, 7 Jan 2020 17:16:01 +0000 (18:16 +0100)]
shared/sleep-config: do not ignore resume_offset when resume not set
This is most likely a user error, let's make it easier to diagnose.
Zbigniew Jędrzejewski-Szmek [Tue, 7 Jan 2020 15:44:12 +0000 (16:44 +0100)]
shared/sleep-config: make swap detection stricter again
To make this easier to understand, let's always log (at debug level)
when we accept or reject each device:
/swapfile: detection of swap file offset on Btrfs is not supported
/swapfile: is a candidate device.
/dev/zram0: ignoring zram swap
/dev/vdb: ignoring device with lower priority
/dev/vdc: ignoring device with lower usable space
...
If we know that hibernation will fail, refuse. This includes cases where
/sys/power/resume is set and doesn't match any device, or
/sys/power/resume_offset is set and we're not on btrfs and it doesn't match.
If /sys/power/resume is not set at all, we still accept the device with the
highest priority (see
6d176522f5480ea9e9a83de5ef5ea5e0d95b79cb and
88bc86fcf895da0d51ddaf93d17b4280f4e60d74)
Tested cases:
1. no swap active → refuse
2. just zram swap active → refuse
3. swapfile on btrfs with /sys/power/resume{,_offset} set → OK
4. swapfile on btrfs with /sys/power/resume set, offset not set → refuse
5. swapfile on btrfs with /sys/power/resume set to nonexistent device, offset set → refuse
6. /sys/power/resume not set, offset set, candidate exists → OK (*)
7. /sys/power/resume not set, offset not set, candidate exists → OK
(*) I think this should fail, but I'm leaving that for the next commit.
Chris Down [Tue, 7 Jan 2020 19:34:55 +0000 (19:34 +0000)]
Merge pull request #14423 from danielshahaf/zsh-add-missing-completions
zsh: Add missing completions
Lennart Poettering [Tue, 7 Jan 2020 14:20:32 +0000 (15:20 +0100)]
boot: fix osrel parser
let's check VERSION instead of VERSION_ID where appropriate.
Fixes: #14493