Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

btrfs mounts should not fail the initial startup #2611

Merged
merged 2 commits into from
Jan 14, 2024
Merged

btrfs mounts should not fail the initial startup #2611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a6a6e
btrfs mounts should not fail the initial startup
szaimen Jan 13, 2024
e275015
Merge branch 'master' into enh/noid/fix-btrfs-mounts
enoch85 Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions not-supported/btrfs-mount.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ If you want to cancel, type 'exit' and press [ENTER].")
then
msg_box "The directory isn't allowed to start with '/mnt/smbshares'"
else
echo "UUID=$UUID $MOUNT_PATH btrfs defaults 0 0" >> /etc/fstab
echo "UUID=$UUID $MOUNT_PATH btrfs defaults,nofail 0 0" >> /etc/fstab
mkdir -p "$MOUNT_PATH"
if ! mount "$MOUNT_PATH"
then
Expand Down Expand Up @@ -313,7 +313,7 @@ fi

# Execute the change to a backup drive
print_text_in_color "$ICyan" "Adjusting permissions..."
sed -i "/$UUID/s/defaults/defaults,noauto/" /etc/fstab
sed -i "/$UUID/s/defaults,nofail/defaults,noauto/" /etc/fstab
chown -R root:root "$MOUNT_PATH"
chmod -R 600 "$MOUNT_PATH"
umount "$MOUNT_PATH"
Expand Down