[X2Go-Commits] [[X2Go Wiki]] page changed: doc:howto:tce

[wiki-admin at x2go.org]

A page in your DokuWiki was added or changed. Here are the details:

Date        : 2017/11/20 14:09
Browser     : Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 Goanna/3.4 Firefox/52.9 PaleMoon/27.6.0
IP-Address  : 134.3.37.90
Hostname    : HSI-KBW-134-3-37-90.hsi14.kabel-badenwuerttemberg.de
Old Revision: https://wiki.x2go.org/doku.php/doc:howto:tce?rev=1511182172
New Revision: https://wiki.x2go.org/doku.php/doc:howto:tce
Edit Summary: [Live-Patching the Build] updated USB media mount patch
User        : stefanbaur

@@ -243,13 +243,49 @@
                  # prepare mount points
                  mkdir("/media");
                  mkdir("/media/$name");
                  mkdir("/media/$name/$ldev");
+ 
  
                  # mount the USB device
-                 if(system("mount $dev /media/$name/$ldev -o uid=$user,sync,uni_xlate")==0)
+                 # sync is supported by all file systems
+                 # uid is supported by vfat (via fat),ntfs,hfs,hpfs
+            
    # uni_xlate is supported by vfat,ntfs
+                 # we must not trigger on iso9660 and udf, or else hybrid USB media
+                 # would only cause a mount of the iso9660 raw device,
+                 # blocking the mount of individual partitions
+                 # real optical media ->x2gocdmanager/x2gothinclient-cdmanager package
+ 
+                 if(system("mount -tvfat,ntfs $dev /media/$name/$ldev -o uid=$user,sync,uni_xlate")==0)
                  {
-                         syslog('notice', "USB device $name ($ldev) successfully mounted");
+                         syslog('notice', "USB device $name ($ldev) successfully mounted (probably vfat or ntfs)");
+                         # if mounted, inform x2goclient about it...
+                         system("touch $mntdir/$ldev.mounted");
+                         open (D,">",expand_filename("~$user/export/$name.$ldev"));
+                         print D "export=/media/$name/$ldev\n";
+                       
 close (D);
+                 }
+                 elsif(system("mount -t hfs $dev /media/$name/$ldev -o uid=$user,sync")==0)
+                 {
+                         syslog('notice', "USB device $name ($ldev) successfully mounted (hfs detected)");
+                         # if mounted, inform x2goclient about it...
+                         system("touch $mntdir/$ldev.mounted");
+                         open (D,">",expand_filename("~$user/export/$name.$ldev"));
+                         print D "export=/media/$name/$ldev\n";
+                         close (D);
+                 }
+                 elsif(system("mount -t hpfs $dev /media/$name/$ldev -o uid=$user,sync")==0)
+                 {
+                         syslog('notice', "USB device $name ($ldev) successfully mounted (hpfs detected)");
+                         # if mounted, inform x2goclient about it...
+                         system("touch $mntdir/$ldev.mounted");
+                         open
(D,">",expand_filename("~$user/export/$name.$ldev"));
+                         print D "export=/media/$name/$ldev\n";
+                         close (D);
+                 }
+                 elsif(system("fuseext2 $dev /media/$name/$ldev -o ro")==0)
+                 {
+                         syslog('notice', "USB device $name ($ldev) successfully mounted readonly (ext*fs detected)");
                          # if mounted, inform x2goclient about it...
                          system("touch $mntdir/$ldev.mounted");
                          open (D,">",expand_filename("~$user/export/$name.$ldev"));
                          print D "export=/media/$name/$ldev\n";


-- 
This mail was generated by DokuWiki at
https://wiki.x2go.org/