/[smecontribs]/rpms/smeserver-usbdisksmanager/contribs7/smeserver-usbdisksmanager-0.2-patch1.patch
ViewVC logotype

Diff of /rpms/smeserver-usbdisksmanager/contribs7/smeserver-usbdisksmanager-0.2-patch1.patch

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

Revision 1.1 by unnilennium, Thu Jun 28 01:39:54 2012 UTC Revision 1.2 by unnilennium, Thu Jun 28 05:45:08 2012 UTC
# Line 1  Line 1 
1  diff -up smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks.patch1 smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks  diff -up smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks.patch1 smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks
2  --- smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks.patch1        2007-04-09 15:58:21.000000000 -0400  --- smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks.patch1        2007-04-09 15:58:21.000000000 -0400
3  +++ smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks       2012-06-27 21:27:51.000000000 -0400  +++ smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks       2012-06-28 01:41:43.000000000 -0400
4  @@ -341,7 +341,7 @@ sub subdevices ($)  @@ -341,7 +341,7 @@ sub subdevices ($)
5       my %mounted=`mount`;       my %mounted=`mount`;
6       my $mounted=`mount`;       my $mounted=`mount`;
# Line 10  diff -up smeserver-usbdisksmanager-0.2/r Line 10  diff -up smeserver-usbdisksmanager-0.2/r
10       my %disques;       my %disques;
11       my $i = 0;       my $i = 0;
12       #my %hashes = (clef =>"valeur", clef2 => "valeur2", [%tablo], %table);       #my %hashes = (clef =>"valeur", clef2 => "valeur2", [%tablo], %table);
13  @@ -395,11 +395,20 @@ sub subdevices ($)  @@ -394,13 +394,29 @@ sub subdevices ($)
14                  $disques{$i}{DEVTYPE}= "SCSI_SATA";
15                }                }
16             elsif ($udevinfo =~ /couldn\'t get the class device/)             elsif ($udevinfo =~ /couldn\'t get the class device/)
17               {  -            {
18  +              -             $disques{$i}{DEVTYPE}= "$tr_unknown";
19                $disques{$i}{DEVTYPE}= "$tr_unknown";  +             {
20    +                my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`;
21    +                if ($infobis =~ /$name/)
22    +                {
23    +                $disques{$i}{DEVTYPE}= "RAID";
24    +                }
25    +                else
26    +                {
27    +                $disques{$i}{DEVTYPE}= "$tr_unknown";
28    +                }
29                }                }
30              else              else
31                {                {
32  -            $disques{$i}{DEVTYPE}= $udevinfo;  -            $disques{$i}{DEVTYPE}= $udevinfo;
33  +             my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`;  -            }
34  +             if ($infobis =~ /$name/)  +                my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`;
35  +               {  +                if ($infobis =~ /$name/)
36  +               $disques{$i}{DEVTYPE}= "RAID";  +                {
37  +               }  +                $disques{$i}{DEVTYPE}= "RAID";
38  +               else  +                }
39  +               {  +                else
40  +               $disques{$i}{DEVTYPE}= $udevinfo;  +                {
41  +               }  +                $disques{$i}{DEVTYPE}= $udevinfo;
42               }  +                }
43    +             }
44             $i++;             $i++;
45           }           }
46         return %disques;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed