diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2018-10-11 10:27:59 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-26 18:09:01 +0100 |
| commit | 5f7ecd610c7918bb89468ce068bfcf68114dc53e (patch) | |
| tree | 84ede3c89ef2b3f28e04bf353b9debf6a1f6f016 /man | |
| parent | import: rerrange tarball/fs imports that have a single top-level directory co... (diff) | |
| download | systemd-5f7ecd610c7918bb89468ce068bfcf68114dc53e.tar.gz systemd-5f7ecd610c7918bb89468ce068bfcf68114dc53e.tar.bz2 systemd-5f7ecd610c7918bb89468ce068bfcf68114dc53e.zip | |
import: drop logic of setting up /var/lib/machines as btrfs loopback mount
Let's simplify things and drop the logic that /var/lib/machines is setup
as auto-growing btrfs loopback file /var/lib/machines.raw.
THis was done in order to make quota available for machine management,
but quite frankly never really worked properly, as we couldn't grow the
file system in sync with its use properly. Moreover philosophically it's
problematic overriding the admin's choice of file system like this.
Let's hence drop this, and simplify things. Deleting code is a good
feeling.
Now that regular file systems provide project quota we could probably
add per-machine quota support based on that, hence the btrfs quota
argument is not that interesting anymore (though btrfs quota is a bit
more powerful as it allows recursive quota, i.e. that the machine pool
gets an overall quota in addition to per-machine quota).
Diffstat (limited to 'man')
| -rw-r--r-- | man/machinectl.xml | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index e403c51e2..95823eb41 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -650,22 +650,7 @@ units. If the size limit shall be disabled, specify <literal>-</literal> as size.</para> - <para>Note that per-container size limits are only supported - on btrfs file systems. Also note that, if - <command>set-limit</command> is invoked without an image - parameter, and <filename>/var/lib/machines</filename> is - empty, and the directory is not located on btrfs, a btrfs - loopback file is implicitly created as - <filename>/var/lib/machines.raw</filename> with the given - size, and mounted to - <filename>/var/lib/machines</filename>. The size of the - loopback may later be readjusted with - <command>set-limit</command>, as well. If such a - loopback-mounted <filename>/var/lib/machines</filename> - directory is used, <command>set-limit</command> without an image - name alters both the quota setting within the file system as - well as the loopback file and file system size - itself.</para></listitem> + <para>Note that per-container size limits are only supported on btrfs file systems.</para></listitem> </varlistentry> <varlistentry> @@ -803,12 +788,8 @@ image is read from standard input, in which case the second argument is mandatory.</para> - <para>Both <command>pull-tar</command> and <command>pull-raw</command> - will resize <filename>/var/lib/machines.raw</filename> and the - filesystem therein as necessary. Optionally, the - <option>--read-only</option> switch may be used to create a - read-only container or VM image. No cryptographic validation - is done when importing the images.</para> + <para>Optionally, the <option>--read-only</option> switch may be used to create a read-only container or VM + image. No cryptographic validation is done when importing the images.</para> <para>Much like image downloads, ongoing imports may be listed with <command>list-transfers</command> and aborted with @@ -920,18 +901,7 @@ <filename>/var/lib/machines/</filename> to make them available for control with <command>machinectl</command>.</para> - <para>Note that some image operations are only supported, - efficient or atomic on btrfs file systems. Due to this, if the - <command>pull-tar</command>, <command>pull-raw</command>, - <command>import-tar</command>, <command>import-raw</command> and - <command>set-limit</command> commands notice that - <filename>/var/lib/machines</filename> is empty and not located on - btrfs, they will implicitly set up a loopback file - <filename>/var/lib/machines.raw</filename> containing a btrfs file - system that is mounted to - <filename>/var/lib/machines</filename>. The size of this loopback - file may be controlled dynamically with - <command>set-limit</command>.</para> + <para>Note that some image operations are only supported, efficient or atomic on btrfs file systems.</para> <para>Disk images are understood by <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> |