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

Rm MOUNT_OPTIONS for it is of no use and dangerous

Browse Source 
Btrfs mount options effects all mount points using the same Btrfs
partition, so specifing it per-mount is useless.

Also, common mount options like `noatime,nosuid,nodev,noexec` has little
to no effect on beesd, so it's just better and simpler to remove this.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2021-09-04 15:56:39 +10:00 committed by Zygo Blaxell
parent ccec63104c
commit 69c3d99552
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/beesd.conf.sample
View File

@ -18,9 +18,6 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
## Options to apply, see `beesd --help` for details ## Options to apply, see `beesd --help` for details
# OPTIONS="--strip-paths --no-timestamps" # OPTIONS="--strip-paths --no-timestamps"
## Mount options
# MOUNT_OPTIONS=""
## Bees DB size ## Bees DB size
# Hash Table Sizing # Hash Table Sizing
# sHash table entries are 16 bytes each # sHash table entries are 16 bytes each

3
scripts/beesd.in
View File

@ -91,7 +91,6 @@ MNT_DIR="${MNT_DIR:-$WORK_DIR/mnt/$UUID}"
BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}" BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}"
BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}" BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}"
DB_SIZE="${DB_SIZE:-$((8192*AL128K))}" DB_SIZE="${DB_SIZE:-$((8192*AL128K))}"
MOUNT_OPTIONS="${MOUNT_OPTIONS:-noatime,nodev,noexec,nosuid}"
INFO "Check: Disk exists" INFO "Check: Disk exists"
if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then
@ -111,7 +110,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
mount --make-private -osubvolid=5 -o "$MOUNT_OPTIONS" /dev/disk/by-uuid/$UUID "$MNT_DIR" || exit 1 mount --make-private -osubvolid=5 /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"