GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

Modify systemd unit and beesd.in to use private mnt namespace

Browse Source 
to:
 - avoid influencing the global mount namespace
 - auto umount upon exit of this unit

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2021-08-30 17:45:46 +10:00 committed by Zygo Blaxell
parent 13abf8aada
commit 4a3d3e7a43
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/beesd.in
View File

@ -111,11 +111,7 @@ mkdir -p "$WORK_DIR" || exit 1
INFO "MOUNT DIR: $MNT_DIR" INFO "MOUNT DIR: $MNT_DIR"
mkdir -p "$MNT_DIR" || exit 1 mkdir -p "$MNT_DIR" || exit 1
umount_w(){ mountpoint -q "$1" && umount -l "$1"; } mount --make-private -osubvolid=5 -o "$MOUNT_OPTIONS" /dev/disk/by-uuid/$UUID "$MNT_DIR" || exit 1
force_umount(){ umount_w "$MNT_DIR"; }
trap force_umount SIGINT SIGTERM EXIT
mount -osubvolid=5 -o "$MOUNT_OPTIONS" /dev/disk/by-uuid/$UUID "$MNT_DIR" || exit 1
if [ ! -d "$BEESHOME" ]; then if [ ! -d "$BEESHOME" ]; then
INFO "Create subvol $BEESHOME for store bees data" INFO "Create subvol $BEESHOME for store bees data"
@ -144,4 +140,4 @@ fi
MNT_DIR="$(realpath $MNT_DIR)" MNT_DIR="$(realpath $MNT_DIR)"
cd "$MNT_DIR" cd "$MNT_DIR"
"$bees_bin" "${ARGUMENTS[@]}" $OPTIONS "$MNT_DIR" exec "$bees_bin" "${ARGUMENTS[@]}" $OPTIONS "$MNT_DIR"

2
scripts/beesd@.service.in
View File

@ -20,5 +20,7 @@ Restart=on-abnormal
StartupCPUWeight=25 StartupCPUWeight=25
StartupIOWeight=25 StartupIOWeight=25
PrivateMounts=true
[Install] [Install]
WantedBy=basic.target WantedBy=basic.target