Skip to content

Use sturdier logical structure to run grep checks on fstab #9

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

Open
zedrdave wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use sturdier logical structure to run grep checks on fstab #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions pi-usb-automount
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ then
fi

# Check /etc/fstab for an entry corresponding to the device
[ "$UUID" ] && fstab=$(grep /etc/fstab -e "^[^#]*UUID=${UUID}") || \
[ "$LABEL" ] && fstab=$(grep /etc/fstab -e "^[^#]*LABEL=${LABEL}") || \
fstab=$(grep /etc/fstab -e "^[ \t]*$dev[ \t]")
if [ "$UUID" ]; then
fstab=$(grep /etc/fstab -e "^[^#]*UUID=${UUID}")
elif [ "$LABEL" ]; then
fstab=$(grep /etc/fstab -e "^[^#]*LABEL=${LABEL}")
else
fstab=$(grep /etc/fstab -e "^[ \t]*$dev[ \t]")
fi

# Don't manage devices that are already in fstab
if [ "$fstab" ]
Expand Down