--- rpms/smeserver-usbdisksmanager/contribs7/smeserver-usbdisksmanager-0.2-patch1.patch 2012/06/28 01:39:54 1.1 +++ rpms/smeserver-usbdisksmanager/contribs7/smeserver-usbdisksmanager-0.2-patch1.patch 2012/06/28 05:45:08 1.2 @@ -1,6 +1,6 @@ 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 --- 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 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 @@ -341,7 +341,7 @@ sub subdevices ($) my %mounted=`mount`; my $mounted=`mount`; @@ -10,25 +10,37 @@ diff -up smeserver-usbdisksmanager-0.2/r my %disques; my $i = 0; #my %hashes = (clef =>"valeur", clef2 => "valeur2", [%tablo], %table); -@@ -395,11 +395,20 @@ sub subdevices ($) +@@ -394,13 +394,29 @@ sub subdevices ($) + $disques{$i}{DEVTYPE}= "SCSI_SATA"; } elsif ($udevinfo =~ /couldn\'t get the class device/) - { -+ - $disques{$i}{DEVTYPE}= "$tr_unknown"; +- { +- $disques{$i}{DEVTYPE}= "$tr_unknown"; ++ { ++ my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`; ++ if ($infobis =~ /$name/) ++ { ++ $disques{$i}{DEVTYPE}= "RAID"; ++ } ++ else ++ { ++ $disques{$i}{DEVTYPE}= "$tr_unknown"; ++ } } else { - $disques{$i}{DEVTYPE}= $udevinfo; -+ my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`; -+ if ($infobis =~ /$name/) -+ { -+ $disques{$i}{DEVTYPE}= "RAID"; -+ } -+ else -+ { -+ $disques{$i}{DEVTYPE}= $udevinfo; -+ } - } +- } ++ my $infobis=`cat /proc/mdstat |grep -o md[0-9]*`; ++ if ($infobis =~ /$name/) ++ { ++ $disques{$i}{DEVTYPE}= "RAID"; ++ } ++ else ++ { ++ $disques{$i}{DEVTYPE}= $udevinfo; ++ } ++ } $i++; } + return %disques;