diff --git a/trisquel-automatic-netinstall-qemu/configure.ac b/trisquel-automatic-netinstall-qemu/configure.ac
index f2e00d1..f482756 100644
--- a/trisquel-automatic-netinstall-qemu/configure.ac
+++ b/trisquel-automatic-netinstall-qemu/configure.ac
@@ -53,11 +53,11 @@ AC_ARG_WITH(
   [trisquel-target-rootfs-size],
   [AS_HELP_STRING(
     [--with-trisquel-target-rootfs-size=SIZE],
-    [Size of the target image (default=3.5G). The size will be passed
+    [Size of the target image (default=3.6G). The size will be passed
     as-is to the 'qemu-img create' command. See 'man 1 qemu-img' for
     more details.])],
   [TRISQUEL_ROOTFS_SIZE=$withval],
-  [TRISQUEL_ROOTFS_SIZE=3.5G]) dnl 3.4G: Fail, 3.5G: OK
+  [TRISQUEL_ROOTFS_SIZE=3.6G]) dnl 3.5G: Fail, 3.6G: OK
 
 AC_ARG_WITH(
   [trisquel-netinstall],
diff --git a/trisquel-automatic-netinstall-qemu/preseed.cfg.tmpl b/trisquel-automatic-netinstall-qemu/preseed.cfg.tmpl
index 5da8c45..605864f 100644
--- a/trisquel-automatic-netinstall-qemu/preseed.cfg.tmpl
+++ b/trisquel-automatic-netinstall-qemu/preseed.cfg.tmpl
@@ -55,10 +55,23 @@ popularity-contest popularity-contest/participate boolean  false
 ################
 # Partitioning #
 ################
+
+# Documentation:
+# - /var/lib/cdebconf/templates.dat inside the netinstall.
+# - doc/devel/partman-auto-recipe.txt inisde the debian-installer source code
+#   (apt-source debian-installer).
+
+# The main reason for using LVM is to facilitate online resize of
+# filesystems: in the past, neox had to reboot one or more VMs like
+# the GNU Boot VM after adding more space.
+d-i partman-auto-lvm/no_boot                      boolean  true
+d-i partman-auto-lvm/new_vg_name                  string   vg
 d-i partman-auto-lvm/guided_size                  string   max
 d-i partman-auto/choose_recipe                    select   atomic
 d-i partman-auto/disk                             string   /dev/vda
-d-i partman-auto/method                           string   regular
+d-i partman-auto/method                           string   lvm
+d-i partman-lvm/confirm                           boolean  true
+d-i partman-lvm/confirm_nooverwrite               boolean  true
 d-i partman-md/confirm                            boolean  true
 d-i partman-partitioning/confirm_write_new_label  boolean  true
 d-i partman-partitioning/confirm_write_new_label  boolean  true
@@ -69,6 +82,27 @@ d-i partman/confirm                               boolean  true
 d-i partman/confirm_nooverwrite                   boolean  true
 d-i partman/confirm_nooverwrite                   boolean  true
 
+# For an unknown reason, with no swap and the "d-i
+# partman-basicfilesystems/no_swap boolean true" setting, the
+# installer blocks. The partman/early_command below based on an
+# example in doc/devel/partman-auto-recipe.txt
+d-i partman/early_command string \
+    debconf-set partman-auto/expert_recipe "boot-root :: \
+    1 10000 -1 ext4 \
+        \$primary{ } \
+        \$bootable{ } \
+        method{ lvm } \
+        \$lvmok{ } \
+        lv_name{ root } \
+        format{ } \
+        use_filesystem{ } \
+        filesystem{ ext4 } \
+        mountpoint{ / } . \
+     1 512 100% linux-swap \
+        method{ swap } \
+        format{ } . \
+        ";
+
 ############
 # Timezone #
 ############