diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-07-14 16:16:25 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-07-15 15:48:05 +0200 |
| commit | da69e8e430dccf4b257f2a6442b9c010dcfe2180 (patch) | |
| tree | db5f6655c4879ba0013ba9e82a0b807db4c8d9b4 /src/fstab-generator | |
| parent | 4981427cd48a13a8245427458e49c5712c2db67e (diff) | |
| download | systemd-da69e8e430dccf4b257f2a6442b9c010dcfe2180.tar.gz | |
fstab-generator: rename 'post' variable
Originally (6b1dc2bd3cdb3bd932b0692be636ddd2879edb92) we had 'pre' and 'post'
to refer to remote-fs-pre.target and remote-fs.target or local-fs-pre.target
and local-fs.target. But 'pre' is long gone, and 'post' by itself doesn't
make much sense. Rename it for clarity.
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 257e99fa13..8bd6022175 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -349,7 +349,7 @@ static int add_mount( const char *opts, int passno, MountPointFlags flags, - const char *post) { + const char *target_unit) { _cleanup_free_ char *name = NULL, @@ -363,7 +363,7 @@ static int add_mount( assert(what); assert(where); assert(opts); - assert(post); + assert(target_unit); assert(source); if (streq_ptr(fstype, "autofs")) @@ -435,10 +435,10 @@ static int add_mount( if (r < 0) return r; - /* Order the mount unit we generate relative to the post unit, so that DefaultDependencies= on the + /* Order the mount unit we generate relative to target_unit, so that DefaultDependencies= on the * target unit won't affect us. */ - if (post && !FLAGS_SET(flags, MOUNT_NOFAIL)) - fprintf(f, "Before=%s\n", post); + if (!FLAGS_SET(flags, MOUNT_NOFAIL)) + fprintf(f, "Before=%s\n", target_unit); if (passno != 0) { r = generator_write_fsck_deps(f, dest, what, where, fstype); @@ -506,14 +506,14 @@ static int add_mount( } if (flags & MOUNT_GROWFS) { - r = generator_hook_up_growfs(dest, where, post); + r = generator_hook_up_growfs(dest, where, target_unit); if (r < 0) return r; } if (!FLAGS_SET(flags, MOUNT_AUTOMOUNT)) { if (!FLAGS_SET(flags, MOUNT_NOAUTO) && strv_isempty(wanted_by) && strv_isempty(required_by)) { - r = generator_add_symlink(dest, post, + r = generator_add_symlink(dest, target_unit, (flags & MOUNT_NOFAIL) ? "wants" : "requires", name); if (r < 0) return r; @@ -561,7 +561,7 @@ static int add_mount( if (r < 0) return log_error_errno(r, "Failed to write unit file %s: %m", automount_name); - r = generator_add_symlink(dest, post, + r = generator_add_symlink(dest, target_unit, (flags & MOUNT_NOFAIL) ? "wants" : "requires", automount_name); if (r < 0) return r; @@ -662,7 +662,6 @@ static int parse_fstab(bool initrd) { k = add_swap(fstab, what, me, flags); else { bool rw_only, automount; - const char *post; rw_only = fstab_test_option(me->mnt_opts, "x-systemd.rw-only\0"); automount = fstab_test_option(me->mnt_opts, @@ -672,12 +671,10 @@ static int parse_fstab(bool initrd) { flags |= rw_only * MOUNT_RW_ONLY | automount * MOUNT_AUTOMOUNT; - if (initrd) - post = SPECIAL_INITRD_FS_TARGET; - else if (mount_is_network(me)) - post = SPECIAL_REMOTE_FS_TARGET; - else - post = SPECIAL_LOCAL_FS_TARGET; + const char *target_unit = + initrd ? SPECIAL_INITRD_FS_TARGET : + mount_is_network(me) ? SPECIAL_REMOTE_FS_TARGET : + SPECIAL_LOCAL_FS_TARGET; k = add_mount(fstab, arg_dest, @@ -688,7 +685,7 @@ static int parse_fstab(bool initrd) { me->mnt_opts, me->mnt_passno, flags, - post); + target_unit); } if (r >= 0 && k < 0) |