From f2ba663ea5135419a0b69d3748975a74dbb88a87 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 21 Sep 2020 17:21:12 +0200 Subject: [PATCH] homed: show actual file system in messages about file systems --- src/home/homework-luks.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index b9e696f0ac..01374baf67 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -1885,7 +1885,7 @@ int home_create_luks( fstype = user_record_file_system_type(h); if (!supported_fstype(fstype)) - return log_error_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT), "Unsupported file system type: %s", h->file_system_type); + return log_error_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT), "Unsupported file system type: %s", fstype); if (sd_id128_is_null(h->partition_uuid)) { r = sd_id128_randomize(&partition_uuid); @@ -1964,7 +1964,8 @@ int home_create_luks( host_size = DISK_SIZE_ROUND_DOWN(h->disk_size); if (!supported_fs_size(fstype, host_size)) - return log_error_errno(SYNTHETIC_ERRNO(ERANGE), "Selected file system size too small for %s.", h->file_system_type); + return log_error_errno(SYNTHETIC_ERRNO(ERANGE), + "Selected file system size too small for %s.", fstype); /* After creation we should reference this partition by its UUID instead of the block * device. That's preferable since the user might have specified a device node such as @@ -1997,7 +1998,7 @@ int home_create_luks( return r; if (!supported_fs_size(fstype, host_size)) - return log_error_errno(SYNTHETIC_ERRNO(ERANGE), "Selected file system size too small for %s.", h->file_system_type); + return log_error_errno(SYNTHETIC_ERRNO(ERANGE), "Selected file system size too small for %s.", fstype); r = tempfn_random(ip, "homework", &temporary_image_path); if (r < 0)