picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

homed: default to "btrfs" as fs type in the LUKS backend 

Apparently both Fedora and suse default to btrfs now, it should hence be
good enough for us too.

This enables a bunch of really nice things for us, most importanly we
can resize home directories freely (i.e. both grow *and* shrink) while
online. It also allows us to add nice subvolume based home directory
snapshotting later on.

Also, whenever we mention the three supported types, alaways mention
them in alphabetical order, which is also our new order of preference.
This commit is contained in:
Lennart Poettering 2020-08-18 15:11:06 +02:00
parent 1b13600948
commit caf6bd166f
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/homectl.xml
View File

@ -566,8 +566,8 @@
<term><option>--fs-type=</option><replaceable>TYPE</replaceable></term>
<listitem><para>When LUKS2 storage is used configures the file system type to use inside the home
directory LUKS2 container. One of <literal>ext4</literal>, <literal>xfs</literal>,
<literal>btrfs</literal>. If not specified
directory LUKS2 container. One of <literal>btrfs</literal>, <literal>ext4</literal>,
<literal>xfs</literal>. If not specified
<citerefentry><refentrytitle>homed.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
defines which default file system type to use. Note that <literal>xfs</literal> is not recommended as
its support for file system resizing is too limited.</para></listitem>

6
man/homed.conf.xml
View File

@ -63,9 +63,9 @@
<varlistentry>
<term><varname>DefaultFileSystemType=</varname></term>
<listitem><para>When using <literal>luks</literal> as storage (see above), selects the default file
system to use inside the user's LUKS volume. Takes one of <literal>ext4</literal>,
<literal>xfs</literal> or <literal>btrfs</literal>. If not specified defaults to
<literal>ext4</literal>. This setting has no effect if a different storage mechanism is used. The
system to use inside the user's LUKS volume. Takes one of <literal>btrfs</literal>,
<literal>ext4</literal> or <literal>xfs</literal>. If not specified defaults to
<literal>btrfs</literal>. This setting has no effect if a different storage mechanism is used. The
file system type selected on the <command>homectl</command> command line always takes
precedence.</para></listitem>
</varlistentry>

2
shell-completion/bash/homectl
View File

@ -139,7 +139,7 @@ _homectl() {
comps=$(cat /etc/shells)
;;
--fs-type)
comps='ext4 xfs btrsf'
comps='btrfs ext4 xfs'
;;
--cifs-user-name)
comps=$(compgen -A user -- "$cur" )

2
src/home/homectl.c
View File

@ -1956,7 +1956,7 @@ static int help(int argc, char *argv[], void *userdata) {
" --image-path=PATH Path to image file/directory\n"
"\n%4$sLUKS Storage User Record Properties:%5$s\n"
" --fs-type=TYPE File system type to use in case of luks\n"
" storage (ext4, xfs, btrfs)\n"
" storage (btrfs, ext4, xfs)\n"
" --luks-discard=BOOL Whether to use 'discard' feature of file system\n"
" when activated (mounted)\n"
" --luks-offline-discard=BOOL\n"

2
src/home/homed.conf
View File

@ -13,4 +13,4 @@
[Home]
#DefaultStorage=
#DefaultFileSystemType=ext4
#DefaultFileSystemType=btrfs

2
src/shared/user-record.c
View File

@ -1581,7 +1581,7 @@ UserStorage user_record_storage(UserRecord *h) {
const char *user_record_file_system_type(UserRecord *h) {
assert(h);
return h->file_system_type ?: "ext4";
return h->file_system_type ?: "btrfs";
}
const char *user_record_skeleton_directory(UserRecord *h) {