mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 01:55:22 +03:00
Merge pull request #28838 from DaanDeMeyer/repart-subvolume
mkosi: Create a few subvolumes in the root partition
This commit is contained in:
commit
f19659b91f
2
.github/workflows/mkosi.yml
vendored
2
.github/workflows/mkosi.yml
vendored
@ -76,7 +76,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
|
||||
- uses: systemd/mkosi@9ffcdac128c66935aa5d5a98633fa7498bce92d1
|
||||
- uses: systemd/mkosi@0af3f8a35c3be0e54b20234be7ab478d25bcc740
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
|
@ -4,3 +4,5 @@
|
||||
Type=root
|
||||
Format=btrfs
|
||||
SizeMinBytes=1G
|
||||
Subvolumes=/home /var
|
||||
MakeDirectories=/home /var
|
||||
|
@ -1756,16 +1756,14 @@ 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)
|
||||
if (!strv_isempty(p->subvolumes) && arg_offline > 0)
|
||||
return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EOPNOTSUPP),
|
||||
"Subvolumes= can only be used with --offline=no");
|
||||
"Subvolumes= cannot be used with --offline=yes");
|
||||
|
||||
/* Verity partitions are read only, let's imply the RO flag hence, unless explicitly configured otherwise. */
|
||||
if ((IN_SET(p->type.designator,
|
||||
PARTITION_ROOT_VERITY,
|
||||
PARTITION_ROOT_VERITY_SIG,
|
||||
PARTITION_USR_VERITY,
|
||||
PARTITION_USR_VERITY_SIG) || p->verity != VERITY_OFF) && p->read_only < 0)
|
||||
PARTITION_USR_VERITY) || p->verity == VERITY_DATA) && p->read_only < 0)
|
||||
p->read_only = true;
|
||||
|
||||
/* Default to "growfs" on, unless read-only */
|
||||
@ -3494,7 +3492,7 @@ static int partition_target_prepare(
|
||||
|
||||
if (arg_offline <= 0) {
|
||||
r = loop_device_make(whole_fd, O_RDWR, p->offset, size, context->sector_size, 0, LOCK_EX, &d);
|
||||
if (r < 0 && (arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r))))
|
||||
if (r < 0 && (arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !strv_isempty(p->subvolumes)))
|
||||
return log_error_errno(r, "Failed to make loopback device of future partition %" PRIu64 ": %m", p->partno);
|
||||
if (r >= 0) {
|
||||
t->loop = TAKE_PTR(d);
|
||||
@ -6022,7 +6020,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))))
|
||||
if (r < 0 && (arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !strv_isempty(p->subvolumes)))
|
||||
return log_error_errno(r, "Failed to make loopback device of %s: %m", temp);
|
||||
}
|
||||
|
||||
@ -6125,7 +6123,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))))
|
||||
if (r < 0 && (arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !strv_isempty(p->subvolumes)))
|
||||
return log_error_errno(r, "Failed to make loopback device of %s: %m", temp);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user