/[smeserver]/rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-local_USB.patch
ViewVC logotype

Annotation of /rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-local_USB.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Jun 7 14:34:17 2010 UTC (14 years, 4 months ago) by filippocarletti
Branch: MAIN
CVS Tags: e-smith-backup-2_2_0-62_el5_sme, e-smith-backup-2_2_0-72_el5_sme, e-smith-backup-2_2_0-40_el5_sme, e-smith-backup-2_2_0-60_el5_sme, e-smith-backup-2_2_0-66_el5_sme, e-smith-backup-2_2_0-65_el5_sme, e-smith-backup-2_2_0-80_el5_sme, e-smith-backup-2_2_0-44_el5_sme, e-smith-backup-2_2_0-83_el5_sme, e-smith-backup-2_2_0-41_el5_sme, e-smith-backup-2_2_0-52_el5_sme, e-smith-backup-2_2_0-82_el5_sme, e-smith-backup-2_2_0-38_el5_sme, e-smith-backup-2_2_0-88_el5_sme, e-smith-backup-2_2_0-74_el5_sme, e-smith-backup-2_2_0-55_el5_sme, e-smith-backup-2_2_0-84_el5_sme, e-smith-backup-2_2_0-63_el5_sme, e-smith-backup-2_2_0-87_el5_sme, e-smith-backup-2_2_0-64_el5_sme, e-smith-backup-2_2_0-43_el5_sme, e-smith-backup-2_2_0-48_el5_sme, e-smith-backup-2_2_0-81_el5_sme, e-smith-backup-2_2_0-68_el5_sme, e-smith-backup-2_2_0-86_el5_sme, e-smith-backup-2_2_0-50_el5_sme, e-smith-backup-2_2_0-51_el5_sme, e-smith-backup-2_2_0-71_el5_sme, e-smith-backup-2_2_0-61_el5_sme, e-smith-backup-2_2_0-57_el5_sme, e-smith-backup-2_2_0-78_el5_sme, e-smith-backup-2_2_0-73_el5_sme, e-smith-backup-2_2_0-79_el5_sme, e-smith-backup-2_2_0-39_el5_sme, e-smith-backup-2_2_0-75_el5_sme, e-smith-backup-2_2_0-76_el5_sme, e-smith-backup-2_2_0-56_el5_sme, e-smith-backup-2_2_0-58_el5_sme, e-smith-backup-2_2_0-45_el5_sme, e-smith-backup-2_2_0-59_el5_sme, e-smith-backup-2_2_0-53_el5_sme, e-smith-backup-2_2_0-67_el5_sme, e-smith-backup-2_2_0-42_el5_sme, e-smith-backup-2_2_0-70_el5_sme, e-smith-backup-2_2_0-77_el5_sme, e-smith-backup-2_2_0-54_el5_sme, e-smith-backup-2_2_0-85_el5_sme, e-smith-backup-2_2_0-69_el5_sme, e-smith-backup-2_2_0-37_el5_sme, e-smith-backup-2_2_0-49_el5_sme, e-smith-backup-2_2_0-47_el5_sme, e-smith-backup-2_2_0-46_el5_sme, HEAD
* Mon Jun  7 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-37.sme
- Check if local USB disk is mounted in backup panel [SME: 6033]

1 filippocarletti 1.1 diff -Naur e-smith-backup-2.2.0-orig/root/etc/e-smith/web/functions/backup e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup
2     --- e-smith-backup-2.2.0-orig/root/etc/e-smith/web/functions/backup 2010-06-07 16:19:19.056134825 +0200
3     +++ e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup 2010-06-07 16:19:45.212888963 +0200
4     @@ -1217,11 +1217,16 @@
5    
6     if ( $VFSType eq 'usb' ) {
7     foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) {
8     - $udi =~ m/^(\S+)/;
9     - my $vollbl = qx(hal-get-property --udi $1 --key volume.label);
10     - $vollbl =~ m/^(\S+)/;
11     - if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
12     - push @usbdisks, $vollbl;
13     + $udi =~ m/^(\S+)/;
14     +
15     + my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted);
16     +
17     + if ($is_mounted eq "false\n") {
18     + my $vollbl = qx(hal-get-property --udi $1 --key volume.label);
19     + $vollbl =~ m/^(\S+)/;
20     + if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
21     + push @usbdisks, $vollbl;
22     + }
23     }
24    
25     unless ($usbdisks[0]){

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed