Skip to content

No findmnt #1

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
rofl0r wants to merge 2 commits into
base: master
Choose a base branch
from
Open

No findmnt #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dedbc3
provide awk callback when findmnt is missing
rofl0r Oct 17, 2013
f185ca4
do not turn none into --none
rofl0r Oct 17, 2013
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
17 changes: 15 additions & 2 deletions cryptmount.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

SHORTOPTS="LMUc:fw:nqvho:O:"
DEPS="cryptsetup blkid findmnt mkswap mktemp"
DEPS="cryptsetup blkid mkswap mktemp"
UDEVRUNNING=0

LOGLEVEL=1
Expand Down Expand Up @@ -93,6 +93,16 @@ trim() {
echo -n $*
}

get_mount() {
if type findmnt &> /dev/null ; then
findmnt -cfmnoTARGET "$1"
else
cat /proc/self/mountinfo | \
awk -v dev="$1" \
'{ for(i=7;$i!="-";$i++); if($(i+2)==dev&&$4=="/"){print $5;r=1;exit}} END {exit !r}'
fi
}

# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #
# #
# Main functions #
Expand Down Expand Up @@ -452,7 +462,7 @@ ct_map() {

if key_dev="$(ct_resolve_device "$key_dev")"; then

if key_mntpnt="$(findmnt -cfmnoTARGET "$key_dev")"; then
if key_mntpnt="$(get_mount "$key_dev")"; then

key="$key_mntpnt/$key"

Expand Down Expand Up @@ -646,6 +656,9 @@ ct_parse_options() {
device-size)
args="$args --size $val"
;;
none)
args=
;;
*)
if [ ${#key} -eq 1 ]; then
args="$args -$key $val"
Expand Down