diff options
author | Tom Gundersen <teg@jklm.no> | 2013-10-05 17:28:09 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2013-10-19 12:23:17 +0200 |
commit | accdd018ede77ef1c057775396c18c73406cbcb4 (patch) | |
tree | dc4aa98c325c85b9662e8eec3fcf92ae4362e765 /src/core/mount.c | |
parent | Remove FsckPassNo from systemd-fsck-root.service (diff) | |
download | systemd-accdd018ede77ef1c057775396c18c73406cbcb4.tar.xz systemd-accdd018ede77ef1c057775396c18c73406cbcb4.zip |
mount/service: drop FsckPassNo support
We now treat passno as boleans in the generators, and don't need this any more. fsck itself
is able to sequentialize checks on the same local media, so in the common case the ordering
is redundant.
It is still possible to force an order by using .d fragments, in case that is desired.
Diffstat (limited to 'src/core/mount.c')
-rw-r--r-- | src/core/mount.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 70cd372e10..88563b34f6 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) { if (r < 0) return r; - if (p->passno > 0 && - UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) { - char *name; - Unit *fsck; - /* Let's add in the fsck service */ - - /* aka SPECIAL_FSCK_SERVICE */ - name = unit_name_from_path_instance("systemd-fsck", p->what, ".service"); - if (!name) - return -ENOMEM; - - r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck); - if (r < 0) { - log_warning_unit(name, - "Failed to prepare unit %s: %s", name, strerror(-r)); - free(name); - return r; - } - free(name); - - SERVICE(fsck)->fsck_passno = p->passno; - - r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true); - if (r < 0) - return r; - } - return 0; } @@ -1410,7 +1383,6 @@ static int mount_add_one( const char *where, const char *options, const char *fstype, - int passno, bool set_flags) { int r; Unit *u; @@ -1530,8 +1502,6 @@ static int mount_add_one( free(p->fstype); p->fstype = f; - p->passno = passno; - if (load_extras) { r = mount_add_extras(MOUNT(u)); if (r < 0) @@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { if (!d || !p) return log_oom(); - k = mount_add_one(m, d, p, o, fstype, 0, set_flags); + k = mount_add_one(m, d, p, o, fstype, set_flags); if (k < 0) r = k; } |