gpt-auto: take timeout opts in rootflags= into account; hibernate-resume: always respect user-defined timeout (#35518)

2024-12-12 11:01:40 +00:00
parent 47859053ba f4a65d5f2d
commit 184ce19841
6 changed files with 136 additions and 129 deletions
@@ -518,7 +518,7 @@ static int create_disk(
                        "After=modprobe@loop.service\n",
                        u_escaped);

-        r = generator_write_timeouts(arg_dest, device, name, options, &filtered);
+        r = generator_write_device_timeout(arg_dest, device, options, &filtered);
        if (r < 0)
                log_warning_errno(r, "Failed to write device timeout drop-in: %m");