On Tue, 2008-06-10 at 15:27 -0500, Dustin Kirkland wrote:
> Also, note that some nasty ^M's made their way into
> src/utils/ecryptfs-umount-confidential.  Hopefully this is something
> you can clean up in the git repo, Mike.

This is actually a really bad thing...  As installed, this script won't
execute.  This needs to be fixed ASAP.

I'm attaching a patch that solves the problem.  I ran dos2unix on it.

:-Dustin
diff --git a/src/utils/ecryptfs-umount-confidential b/src/utils/ecryptfs-umount-confidential
index 08a0ab2..21ca5dd 100755
--- a/src/utils/ecryptfs-umount-confidential
+++ b/src/utils/ecryptfs-umount-confidential
@@ -1,19 +1,19 @@
-#!/bin/sh
-# This script unmounts a user's confidential ecryptfs folder, and makes
-# both the mountpoint and underlying encrypted directories read-only.
-#
-# Original by Michael Halcrow, IBM
-# Extracted to a stand-alone script by Dustin Kirkland <[EMAIL PROTECTED]>
-
-CONFIDENTIAL="$HOME/Confidential"
-. $HOME/.ecryptfsrc 2>/dev/null || /bin/true
-if mount | grep -q "$CONFIDENTIAL type ecryptfs"; then
-	username=`whoami`
-	count=`who | grep "^$username " | wc -l`
-	if [ $count -le 1 ]; then
-		ENCRYPTED_DIR=`grep " $CONFIDENTIAL " /etc/fstab | awk '{print $1}'`
-		umount -l "$CONFIDENTIAL" && chmod 500 "$CONFIDENTIAL" "$ENCRYPTED_DIR"
-	fi
-fi
-
-ecryptfs-zombie-kill
+#!/bin/sh
+# This script unmounts a user's confidential ecryptfs folder, and makes
+# both the mountpoint and underlying encrypted directories read-only.
+#
+# Original by Michael Halcrow, IBM
+# Extracted to a stand-alone script by Dustin Kirkland <[EMAIL PROTECTED]>
+
+CONFIDENTIAL="$HOME/Private"
+. $HOME/.ecryptfsrc 2>/dev/null || /bin/true
+if mount | grep -q "$CONFIDENTIAL type ecryptfs"; then
+	username=`whoami`
+	count=`who | grep "^$username " | wc -l`
+	if [ $count -le 1 ]; then
+		ENCRYPTED_DIR=`grep " $CONFIDENTIAL " /etc/fstab | awk '{print $1}'`
+		umount -l "$CONFIDENTIAL" && chmod 500 "$CONFIDENTIAL" "$ENCRYPTED_DIR"
+	fi
+fi
+
+ecryptfs-zombie-kill

Attachment: signature.asc
Description: This is a digitally signed message part

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
eCryptfs-devel mailing list
eCryptfs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel

Reply via email to