From caf6bd166f6521e1e33a25c39bb2e1b05d61b733 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 Aug 2020 15:11:06 +0200
Subject: [PATCH] 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.
---
 man/homectl.xml               | 4 ++--
 man/homed.conf.xml            | 6 +++---
 shell-completion/bash/homectl | 2 +-
 src/home/homectl.c            | 2 +-
 src/home/homed.conf           | 2 +-
 src/shared/user-record.c      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/man/homectl.xml b/man/homectl.xml
index 0724749c07..f2e9879930 100644
--- a/man/homectl.xml
+++ b/man/homectl.xml
@@ -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>
diff --git a/man/homed.conf.xml b/man/homed.conf.xml
index 2c5f3355d3..d43a83de3e 100644
--- a/man/homed.conf.xml
+++ b/man/homed.conf.xml
@@ -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>
diff --git a/shell-completion/bash/homectl b/shell-completion/bash/homectl
index c2a9e610d1..1a1d522966 100644
--- a/shell-completion/bash/homectl
+++ b/shell-completion/bash/homectl
@@ -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" )
diff --git a/src/home/homectl.c b/src/home/homectl.c
index 9d082ef0c0..9e80a1d60f 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -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"
diff --git a/src/home/homed.conf b/src/home/homed.conf
index 6de75fc5ca..1b5dbedabd 100644
--- a/src/home/homed.conf
+++ b/src/home/homed.conf
@@ -13,4 +13,4 @@
 
 [Home]
 #DefaultStorage=
-#DefaultFileSystemType=ext4
+#DefaultFileSystemType=btrfs
diff --git a/src/shared/user-record.c b/src/shared/user-record.c
index 678f04e537..5d9fe84061 100644
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@ -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) {