mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
repart: don't insist on coming up on partition label ourselves
If the user specified a label, use that. Fixes: #15841
This commit is contained in:
parent
44dcb318cc
commit
feb13fca97
@ -2233,7 +2233,6 @@ static int context_acquire_partition_uuids_and_labels(Context *context) {
|
||||
|
||||
LIST_FOREACH(partitions, p, context->partitions) {
|
||||
assert(sd_id128_is_null(p->new_uuid));
|
||||
assert(!p->new_label);
|
||||
|
||||
/* Never touch foreign partitions */
|
||||
if (PARTITION_IS_FOREIGN(p)) {
|
||||
@ -2256,6 +2255,9 @@ static int context_acquire_partition_uuids_and_labels(Context *context) {
|
||||
return r;
|
||||
}
|
||||
|
||||
if (p->new_label) /* Explicitly set by user? */
|
||||
continue;
|
||||
|
||||
if (!isempty(p->current_label)) {
|
||||
p->new_label = strdup(p->current_label); /* never change initialized labels */
|
||||
if (!p->new_label)
|
||||
|
Loading…
Reference in New Issue
Block a user