From b2efed520b51f71484e45289f9f34b611838cd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 10 Aug 2021 08:37:50 +0200 Subject: fstab-generator: put What= before Where= All units in units/ follow this pattern, as do all other generators that we provide. The question of the order was raised in https://github.com/systemd/zram-generator/pull/90#discussion_r684965984, and I think it's nice to make it consistent everywhere (What= before Where= matches mount(8) and fstab(5)). --- src/fstab-generator/fstab-generator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/fstab-generator') diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index bafc7b8f96..bae67be09f 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -451,6 +451,10 @@ static int add_mount( "\n" "[Mount]\n"); + r = write_what(f, what); + if (r < 0) + return r; + if (original_where) fprintf(f, "# Canonicalized from %s\n", original_where); @@ -459,10 +463,6 @@ static int add_mount( return log_oom(); fprintf(f, "Where=%s\n", where_escaped); - r = write_what(f, what); - if (r < 0) - return r; - if (!isempty(fstype) && !streq(fstype, "auto")) { _cleanup_free_ char *t = NULL; -- cgit v1.2.1