Generate systemd-fsck-root.service in the initramfs
In the initrafms, generate a systemd-fsck-root.service to replace
systemd-fsck@<sysroot-device>.service. This way, after we transition
to the real root, systemd-fsck-root.service is marked as already done.
This introduces an unnecessary synchronization point, because
systemd-fsck@* is ordered after systemd-fsck-root also in the
initramfs. In practice this shouldn't be a problem.
https://bugzilla.redhat.com/show_bug.cgi?id=1201979
C.f. 956eaf2b8d.
This commit is contained in:
+59
-4
@@ -28,8 +28,52 @@
|
||||
#include "generator.h"
|
||||
#include "path-util.h"
|
||||
#include "fstab-util.h"
|
||||
#include "fileio.h"
|
||||
#include "dropin.h"
|
||||
|
||||
static int write_fsck_sysroot_service(const char *dir, const char *what) {
|
||||
const char *unit;
|
||||
_cleanup_free_ char *device = NULL;
|
||||
_cleanup_fclose_ FILE *f = NULL;
|
||||
int r;
|
||||
|
||||
unit = strjoina(dir, "/systemd-fsck-root.service");
|
||||
log_debug("Creating %s", unit);
|
||||
|
||||
r = unit_name_from_path(what, ".device", &device);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to convert device \"%s\" to unit name: %m", what);
|
||||
|
||||
f = fopen(unit, "wxe");
|
||||
if (!f)
|
||||
return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
|
||||
|
||||
fprintf(f,
|
||||
"# Automatically generated by %1$s\n\n"
|
||||
"[Unit]\n"
|
||||
"Documentation=man:systemd-fsck-root.service(8)\n"
|
||||
"Description=File System Check on %2$s\n"
|
||||
"DefaultDependencies=no\n"
|
||||
"BindsTo=%3$s\n"
|
||||
"After=%3$s\n"
|
||||
"Before=shutdown.target\n"
|
||||
"\n"
|
||||
"[Service]\n"
|
||||
"Type=oneshot\n"
|
||||
"RemainAfterExit=yes\n"
|
||||
"ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
|
||||
"TimeoutSec=0\n",
|
||||
program_invocation_short_name,
|
||||
what,
|
||||
device);
|
||||
|
||||
fflush(f);
|
||||
if (ferror(f))
|
||||
return log_error_errno(errno, "Failed to write unit file %s: %m", unit);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int generator_write_fsck_deps(
|
||||
FILE *f,
|
||||
const char *dir,
|
||||
@@ -69,11 +113,22 @@ int generator_write_fsck_deps(
|
||||
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
||||
|
||||
} else {
|
||||
_cleanup_free_ char *fsck = NULL;
|
||||
_cleanup_free_ char *_fsck = NULL;
|
||||
const char *fsck;
|
||||
|
||||
r = unit_name_from_path_instance("systemd-fsck", what, ".service", &fsck);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to create fsck service name: %m");
|
||||
if (in_initrd() && path_equal(where, "/sysroot")) {
|
||||
r = write_fsck_sysroot_service(dir, what);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
fsck = "systemd-fsck-root.service";
|
||||
} else {
|
||||
r = unit_name_from_path_instance("systemd-fsck", what, ".service", &_fsck);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to create fsck service name: %m");
|
||||
|
||||
fsck = _fsck;
|
||||
}
|
||||
|
||||
fprintf(f,
|
||||
"RequiresOverridable=%1$s\n"
|
||||
|
||||
Reference in New Issue
Block a user