[X2Go-Commits] [x2gothinclient] 05/06: usbmount/x2gousbmount: try to create file-sharing facilities harder.

git-admin at x2go.org git-admin at x2go.org
Tue Apr 25 22:44:19 CEST 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 44b86525be59cf087c26b9d7dca5d225cc2087cc
Author: Stefan Baur <X2Go-ML-1 at baur-itcs.de>
Date:   Tue Apr 25 22:33:30 2017 +0200

    usbmount/x2gousbmount: try to create file-sharing facilities harder.
---
 debian/changelog      |  1 +
 usbmount/x2gousbmount | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 559558e..03a6502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Allow Xinerama / XRandR setup via /proc/cmdline. (Closes: #726).
   * usbmount/x2gousbmount:
     - Make user pseudo-selectible via a variable and fix usage across file.
+    - Try to create file-sharing facilities harder.
 
   [ Mark Pedersen-Cook ]
   * debian/po:
diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount
index da9e1a5..5b4d2df 100755
--- a/usbmount/x2gousbmount
+++ b/usbmount/x2gousbmount
@@ -29,6 +29,34 @@ if ( -d "/lib/live/config" ) {
 	$user='x2gothinclient';
 }
 
+# We need this as chown requires numeric uid/gid
+my ($login,$pass,$uid,$gid) = getpwnam($user);
+
+# Some last-ditch efforts to fulfill the prerequisites for File Sharing:
+# - This is stuff that should already have happened earlier in the boot process.
+# - Also, if a directory already exists, we silently assume that ownership and
+#   permissions are correct. This is so that users that deliberately set
+#   different ownership/permission values don't have their settings silently
+#   overwritten.
+
+unless ( -d expand_filename("~$user/mounts")) {
+	mkdir expand_filename("~$user/mounts");
+	chmod 0700, expand_filename("~$user/mounts");
+	chown $uid, $gid, expand_filename("~$user/mounts");
+}
+
+unless ( -d expand_filename("~$user/export")) {
+	mkdir expand_filename("~$user/export");
+	chmod 0700, expand_filename("~$user/export");
+	chown $uid, $gid, expand_filename("~$user/export");
+}
+
+unless ( -d expand_filename("~$user/logins")) {
+	mkdir expand_filename("~$user/logins");
+	chmod 0700, expand_filename("~$user/logins");
+	chown $uid, $gid, expand_filename("~$user/logins");
+}
+
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(LOG_NOTICE) );
 

--
Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list