SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33498 from DaanDeMeyer/btrfs

Browse Source 
repart: Allow Subvolumes= when running offline
This commit is contained in:
Daan De Meyer
2024-08-21 17:19:09 +02:00
committed by GitHub
parent 1ce69e0661 eca3d07dd1
commit 148b16cb2a
2 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/repart.d.xml
+4 -4
View File
@@ -548,8 +548,8 @@
<para>Note that this option only takes effect if the target filesystem supports subvolumes, such as
<literal>btrfs</literal>.</para>
<para>Note that due to limitations of <literal>mkfs.btrfs</literal>, this option is only supported
when running with <option>--offline=no</option>.</para>
<para>Note that this option is only supported in combination with <option>--offline=yes</option>
since btrfs-progs 6.11 or newer.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
@@ -564,8 +564,8 @@
<para>Note that this option only takes effect if the target filesystem supports subvolumes, such as
<literal>btrfs</literal>.</para>
<para>Note that due to limitations of <literal>mkfs.btrfs</literal>, this option is only supported
when running with <option>--offline=no</option>.</para>
<para>Note that this option is only supported in combination with <option>--offline=yes</option>
since btrfs-progs 6.11 or newer.</para>
<xi:include href="version-info.xml" xpointer="v256"/></listitem>
</varlistentry>
src/partition/repart.c
+44 -19
View File
@@ -1668,6 +1668,9 @@ static int config_parse_make_dirs(
if (r < 0)
continue;
if (strv_contains(*sv, d))
continue;
r = strv_consume(sv, TAKE_PTR(d));
if (r < 0)
return log_oom();
@@ -2084,14 +2087,6 @@ static int partition_read_definition(Partition *p, const char *path, const char
"SizeMinBytes=/SizeMaxBytes= cannot be used with Verity=%s.",
verity_mode_to_string(p->verity));
if (!strv_isempty(p->subvolumes) && arg_offline > 0)
return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EOPNOTSUPP),
"Subvolumes= cannot be used with --offline=yes.");
if (p->default_subvolume && arg_offline > 0)
return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EOPNOTSUPP),
"DefaultSubvolume= cannot be used with --offline=yes.");
if (p->default_subvolume && !path_strv_contains(p->subvolumes, p->default_subvolume))
return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EINVAL),
"DefaultSubvolume= must be one of the paths in Subvolumes=.");
@@ -3837,7 +3832,7 @@ static int prepare_temporary_file(Context *context, PartitionTarget *t, uint64_t
static bool loop_device_error_is_fatal(const Partition *p, int r) {
assert(p);
return arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !strv_isempty(p->subvolumes) || p->default_subvolume;
return arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r));
}
static int partition_target_prepare(
@@ -5063,7 +5058,7 @@ static int set_default_subvolume(Partition *p, const char *root) {
return 0;
}
static bool partition_needs_populate(Partition *p) {
static bool partition_needs_populate(const Partition *p) {
assert(p);
return !strv_isempty(p->copy_files) || !strv_isempty(p->make_directories);
}
@@ -5153,6 +5148,40 @@ static int partition_populate_filesystem(Context *context, Partition *p, const c
return 0;
}
static int finalize_extra_mkfs_options(const Partition *p, const char *root, char ***ret) {
int r;
_cleanup_strv_free_ char **sv = NULL;
assert(p);
assert(ret);
r = mkfs_options_from_env("REPART", p->format, &sv);
if (r < 0)
return log_error_errno(r,
"Failed to determine mkfs command line options for '%s': %m",
p->format);
if (partition_needs_populate(p) && root && streq(p->format, "btrfs")) {
STRV_FOREACH(subvol, p->subvolumes) {
if (p->default_subvolume && streq(*subvol, p->default_subvolume))
continue;
r = strv_extend_many(&sv, "--subvol", *subvol);
if (r < 0)
return log_oom();
}
if (p->default_subvolume) {
r = strv_extend_many(&sv, "--default-subvol", p->default_subvolume);
if (r < 0)
return log_oom();
}
}
*ret = TAKE_PTR(sv);
return 0;
}
static int context_mkfs(Context *context) {
int r;
@@ -5221,11 +5250,9 @@ static int context_mkfs(Context *context) {
return r;
}
r = mkfs_options_from_env("REPART", p->format, &extra_mkfs_options);
r = finalize_extra_mkfs_options(p, root, &extra_mkfs_options);
if (r < 0)
return log_error_errno(r,
"Failed to determine mkfs command line options for '%s': %m",
p->format);
return r;
r = make_filesystem(partition_target_path(t), p->format, strempty(p->new_label), root,
p->fs_uuid, arg_discard, /* quiet = */ false,
@@ -6782,11 +6809,9 @@ static int context_minimize(Context *context) {
return r;
}
r = mkfs_options_from_env("REPART", p->format, &extra_mkfs_options);
r = finalize_extra_mkfs_options(p, root, &extra_mkfs_options);
if (r < 0)
return log_error_errno(r,
"Failed to determine mkfs command line options for '%s': %m",
p->format);
return r;
r = make_filesystem(d ? d->node : temp,
p->format,
@@ -6864,7 +6889,7 @@ static int context_minimize(Context *context) {
if (arg_offline <= 0) {
r = loop_device_make(fd, O_RDWR, 0, UINT64_MAX, context->sector_size, 0, LOCK_EX, &d);
if (r < 0 && (arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !strv_isempty(p->subvolumes)))
if (r < 0 && loop_device_error_is_fatal(p, r))
return log_error_errno(r, "Failed to make loopback device of %s: %m", temp);
}