homed: show actual file system in messages about file systems
This commit is contained in:
parent
3e0b54867e
commit
f2ba663ea5
|
@ -1885,7 +1885,7 @@ int home_create_luks(
|
||||||
|
|
||||||
fstype = user_record_file_system_type(h);
|
fstype = user_record_file_system_type(h);
|
||||||
if (!supported_fstype(fstype))
|
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)) {
|
if (sd_id128_is_null(h->partition_uuid)) {
|
||||||
r = sd_id128_randomize(&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);
|
host_size = DISK_SIZE_ROUND_DOWN(h->disk_size);
|
||||||
|
|
||||||
if (!supported_fs_size(fstype, host_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
|
/* 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
|
* 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;
|
return r;
|
||||||
|
|
||||||
if (!supported_fs_size(fstype, host_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);
|
||||||
|
|
||||||
r = tempfn_random(ip, "homework", &temporary_image_path);
|
r = tempfn_random(ip, "homework", &temporary_image_path);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
|
|
Loading…
Reference in New Issue