mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 10:25:06 +03:00
sleep-config: fix useless check for swapfile type
Since 0c6f1f4ea4
the check was useless, because the kernel will
ever only write "partition" or "file" there.
OTOH, it is possible that "\\040(deleted)" (escaped " (deleted)")
will be added for removed files. This should not happen, so add
a warning to detect those cases.
This commit is contained in:
parent
c4708f1323
commit
db69869f26
@ -183,7 +183,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
|
||||
(void) fscanf(f, "%*s %*s %*s %*s %*s\n");
|
||||
|
||||
for (i = 1;; i++) {
|
||||
_cleanup_free_ char *dev = NULL, *d = NULL, *type = NULL;
|
||||
_cleanup_free_ char *dev = NULL, *type = NULL;
|
||||
size_t size_field, used_field;
|
||||
int k;
|
||||
|
||||
@ -202,12 +202,8 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
|
||||
continue;
|
||||
}
|
||||
|
||||
d = cunescape(dev);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
if (!streq(type, "partition") && !streq(type, "file")) {
|
||||
log_debug("Partition %s has type %s, ignoring.", d, type);
|
||||
if (streq(type, "partition") && endswith(dev, "\\040(deleted)")) {
|
||||
log_warning("Ignoring deleted swapfile '%s'.", dev);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user