From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Oct 2016 15:56:20 +0000 (-0300)
Subject: Fixes mount-media
X-Git-Tag: 0.2.4~47
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ab62e77f3f927ef3f35ecc5c8d1bbd4650fd94b4;p=hydra.git

Fixes mount-media
---

diff --git a/share/hydractl/mount-media b/share/hydractl/mount-media
index 6916439..468eb7e 100755
--- a/share/hydractl/mount-media
+++ b/share/hydractl/mount-media
@@ -17,6 +17,11 @@ if [ -z "$MEDIA" ]; then
   exit 1
 fi
 
+# Set sudo config
+if [ "`whoami`" != 'root' ]; then
+  sudo="sudo"
+fi
+
 # Check volume config
 if [ -z "$VOLUME" ]; then
   VOLUME="sdb1"
@@ -30,12 +35,7 @@ DEVICE="/dev/$DISK"
 if $sudo lvdisplay /dev/$MEDIA/root &> /dev/null; then
   LVM="yes"
   DEVICE="/dev/$MEDIA/root"
-  MAPPING="$MAPPING-root"
-fi
-
-# Set sudo config
-if [ "`whoami`" != 'root' ]; then
-  sudo="sudo"
+  MAPPING="$MAPPING-unlocked"
 fi
 
 if [ "$BASENAME" == "mount-media" ]; then
@@ -48,7 +48,7 @@ if [ "$BASENAME" == "mount-media" ]; then
   fi
 
   if [ "$LVM" == "yes" ]; then
-    $sudo vgchange -a y $VOLUME
+    $sudo vgchange -a y $MEDIA
   fi
 
   echo "Initializing crypto layer..."
@@ -65,6 +65,6 @@ elif [ "$BASENAME" == "umount-media" ]; then
   $sudo cryptsetup luksClose $MAPPING
 
   if [ "$LVM" == "yes" ]; then
-    $sudo vgchange -a n $VOLUME
+    $sudo vgchange -a n $MEDIA
   fi
 fi