From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 2 Jun 2021 13:49:10 +0000 (+0200)
Subject: pid1: don't choke on overly long device paths
X-Git-Tag: v249-rc1~103^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19801%2Fhead;p=thirdparty%2Fsystemd.git

pid1: don't choke on overly long device paths

This mimics what we do for device units: if there's a device we cannot
synthesize a good swap unit name for, then proceed without failure.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index fc781a3815b..8aecc391e7b 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1426,13 +1426,14 @@ int swap_process_device_new(Manager *m, sd_device *dev) {
         assert(m);
         assert(dev);
 
-        r = sd_device_get_devname(dev, &dn);
-        if (r < 0)
+        if (sd_device_get_devname(dev, &dn) < 0)
                 return 0;
 
         r = unit_name_from_path(dn, ".swap", &e);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_debug_errno(r, "Cannot convert device name '%s' to unit name, ignoring: %m", dn);
+                return 0;
+        }
 
         u = manager_get_unit(m, e);
         if (u)