\n";
$OUT .= "$clef | ";
$OUT .= "".db_get_type(\%usbdisks, $clef )." | ";
+ # status auto mount media
+ $OUT .= " ";
+ if ( $usbd_status_mediaG eq "disabled")
+ {
+ $OUT.= "Globally disabled"
+ }
+ else
+ {
+ if ( (db_get_type(\%usbdisks, $clef ) eq "USB") || (db_get_type(\%usbdisks, $clef ) eq "FireWire") )
+ {
+ if (db_get_prop(\%usbdisks, $clef , "status_media")eq "enabled")
+ {$OUT .="".db_get_prop(\%usbdisks, $clef , "status_media")." "; }
+ elsif (db_get_prop(\%usbdisks, $clef , "status_media")eq "disabled")
+ {$OUT .="".db_get_prop(\%usbdisks, $clef , "status_media")." "; }
+ else
+ {$OUT .="not set"; }
+ }
+ else {$OUT.= db_get_prop(\%usbdisks, $clef , "status_media");};
+ }
+ $OUT.= " | ";
# status auto mount_to
- $OUT .= " ";
+ $OUT .= " | ";
if ( (db_get_type(\%usbdisks, $clef ) eq "USB") || (db_get_type(\%usbdisks, $clef ) eq "FireWire") )
{
if (db_get_prop(\%usbdisks, $clef , "status")eq "enabled")
@@ -871,19 +893,6 @@
}
else {$OUT.= db_get_prop(\%usbdisks, $clef , "status");};
$OUT.= " | ";
- # status auto mount media
- $OUT .= " ";
- if ( (db_get_type(\%usbdisks, $clef ) eq "USB") || (db_get_type(\%usbdisks, $clef ) eq "FireWire") )
- {
- if (db_get_prop(\%usbdisks, $clef , "status_media")eq "enabled")
- {$OUT .="".db_get_prop(\%usbdisks, $clef , "status_media")." "; }
- elsif (db_get_prop(\%usbdisks, $clef , "status_media")eq "disabled")
- {$OUT .="".db_get_prop(\%usbdisks, $clef , "status_media")." "; }
- else
- {$OUT .="not set"; }
- }
- else {$OUT.= db_get_prop(\%usbdisks, $clef , "status_media");};
- $OUT.= " | ";
#mount to
$OUT .= "".db_get_prop(\%usbdisks, $clef , "mountto")." | ";
# connecté
@@ -970,13 +979,16 @@
{
my ($q) = @_;
my $UUID = $q->param ('UUID') || return showInitial ($q,"");
- my $blkid= `/sbin/blkid -t UUID=$UUID`;
- my $dev= $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "$tr_unknown";
- my $dest= db_get_prop(\%usbdisks, $UUID, "mountto");
- my $options= $_=db_get_prop(\%usbdisks, $UUID, "options")? db_get_prop(\%usbdisks, $UUID, "options") : "pamconsole,exec,noauto,managed";
+ ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
+ my $blkid= `/sbin/blkid -t UUID=$UUID -c /dev/null`;
+ my $dev= $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "$tr_unknown";
+ #my $dev = `/bin/readlink -f /dev/disk/by-uuid/$UUID`;#with line return at the end
+ my $dest= db_get_prop(\%usbdisks, $UUID, "mountto");
+ my $options= $_=db_get_prop(\%usbdisks, $UUID, "options")? db_get_prop(\%usbdisks, $UUID, "options") : "default,noauto";
# mount par le UUID pas supporté pour vfat
- #my $mount=`/bin/mount -U $UUID $dest -o pamconsole,exec,noauto,managed`;
- my $mount=`/bin/mount $dev -t auto $dest -o $options`;
+ #my $mount=`/bin/mount -U $UUID $dest -o default,noauto`;
+ # to get filesystem type : blkid -o value -s TYPE /dev/sdc1
+ my $mount=`/bin/mount $dev -t auto $dest -o $options 2>&1`;
my $mounted= `/bin/mount`=~ /$dev/ ? "$tr_success" : "$tr_failure";
showInitial ($q, "$tr_rapport mount :
$mounted
$dev: $mount
");
@@ -985,12 +997,13 @@
sub USBUnMounttoDisk($)
{
- my ($q) = @_;
- my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+ my ($q) = @_;
+ my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+ ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
my $blkid= `/sbin/blkid -t UUID=$UUID`;
- my $dev= $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "unknown";
+ my $dev= $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "unknown";
my $dest= db_get_prop(\%usbdisks, $UUID, "mountto");
- my $mount=`/bin/umount -f $dest`;
+ my $mount=`/bin/umount -f $dest 2>&1`;
my $mounted= `/bin/mount`=~ /$dev/ ? "$tr_failure" : "$tr_success";
showInitial ($q, "$tr_rapport umount :
$mounted
$dest: $mount
");