diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-01-18 09:54:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-18 09:54:50 +0100 |
commit | d3d308538ecb31113db64f0200f1b4c3e060450c (patch) | |
tree | 148d4eeccae775c6373769914d32e8ef86bed43c /src/home | |
parent | c78d18215b3e5b0f0896ddb1d0d72c666b5e830b (diff) | |
parent | e1878ef72a2f88652b13a320bb57275c54128aca (diff) | |
download | systemd-d3d308538ecb31113db64f0200f1b4c3e060450c.tar.gz |
Merge pull request #26044 from DaanDeMeyer/repart-sector-size
repart: Allow configuring sector size
Diffstat (limited to 'src/home')
-rw-r--r-- | src/home/homectl.c | 20 | ||||
-rw-r--r-- | src/home/homework-luks.c | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/home/homectl.c b/src/home/homectl.c index 0a4c01834a..fd71e98eef 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -1798,26 +1798,6 @@ static int parse_disk_size(const char *t, uint64_t *ret) { return 0; } -static int parse_sector_size(const char *t, uint64_t *ret) { - int r; - - assert(t); - assert(ret); - - uint64_t ss; - - r = safe_atou64(t, &ss); - if (r < 0) - return log_error_errno(r, "Failed to parse sector size parameter %s", t); - if (ss < 512 || ss > 4096) /* Allow up to 4K due to dm-crypt support and 4K alignment by the homed LUKS backend */ - return log_error_errno(SYNTHETIC_ERRNO(ERANGE), "Sector size not between 512 and 4096: %s", t); - if (!ISPOWEROF2(ss)) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Sector size not power of 2: %s", t); - - *ret = ss; - return 0; -} - static int resize_home(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; _cleanup_(user_record_unrefp) UserRecord *secret = NULL; diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index f215558ae0..3433cf7d40 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -2356,7 +2356,7 @@ int home_create_luks( r = mkfs_options_for_fstype(fstype, &extra_mkfs_options); if (r < 0) return log_error_errno(r, "Failed to determine mkfs command line options for '%s': %m", fstype); - r = make_filesystem(setup->dm_node, fstype, user_record_user_name_and_realm(h), NULL, fs_uuid, user_record_luks_discard(h), extra_mkfs_options); + r = make_filesystem(setup->dm_node, fstype, user_record_user_name_and_realm(h), NULL, fs_uuid, user_record_luks_discard(h), 0, extra_mkfs_options); if (r < 0) return r; |