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

homed: when creating home directory as btrfs inside luks volume, place subvol inside it

Browse source 
When managing a home directory as LUKS image we currently place a
directory at the top that contains the actual home directory (so that
the home directory of the user won't be cluttered by lost-found and
suchlike). On btrfs let's make that a subvol though. This is a good idea
so that possibly later on we can make use of this for automatic history
management.

Fixes: #15121
This commit is contained in:
Lennart Poettering 2020-04-09 11:57:15 +02:00
parent 82c4440ddd
commit 0be94a199e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/home/homework-luks.c
View file

@ -8,6 +8,7 @@
#include "blkid-util.h"
#include "blockdev-util.h"
#include "btrfs-util.h"
#include "chattr-util.h"
#include "dm-util.h"
#include "errno-util.h"
@ -2037,8 +2038,10 @@ int home_create_luks(
goto fail;
}
if (mkdir(subdir, 0700) < 0) {
r = log_error_errno(errno, "Failed to create user directory in mounted image file: %m");
/* Prefer using a btrfs subvolume if we can, fall back to directory otherwise */
r = btrfs_subvol_make_fallback(subdir, 0700);
if (r < 0) {
log_error_errno(r, "Failed to create user directory in mounted image file: %m");
goto fail;
}