smeserver-usbdisksmanager/contribs7/smeserver-usbdisksmanager-0.2-patch1.patch

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-28 01:41:43.000000000 -0400
@@ -341,7 +341,7 @@ sub subdevices ($)
     my %mounted=`mount`;
     my $mounted=`mount`;
     my %fstab= `cat /etc/fstab`;
-    my @blkid= `/sbin/blkid`;
+    my @blkid= `/sbin/blkid -c /dev/null`;
     my %disques;
     my $i = 0;
     #my %hashes = (clef =>"valeur", clef2 => "valeur2", [%tablo], %table);
@@ -394,13 +394,29 @@ sub subdevices ($)
              $disques{$i}{DEVTYPE}= "SCSI_SATA";
              }
           elsif ($udevinfo =~ /couldn\'t get the class device/)
-            {
-             $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;
+                }
+             }
           $i++;
         }
     return %disques;
1	unnilennium	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
2			--- smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks.patch1 2007-04-09 15:58:21.000000000 -0400
3	unnilennium	1.2	+++ smeserver-usbdisksmanager-0.2/root/etc/e-smith/web/functions/usbdisks 2012-06-28 01:41:43.000000000 -0400
4	unnilennium	1.1	@@ -341,7 +341,7 @@ sub subdevices ($)
5			my %mounted=`mount`;
6			my $mounted=`mount`;
7			my %fstab= `cat /etc/fstab`;
8			- my @blkid= `/sbin/blkid`;
9			+ my @blkid= `/sbin/blkid -c /dev/null`;
10			my %disques;
11			my $i = 0;
12			#my %hashes = (clef =>"valeur", clef2 => "valeur2", [%tablo], %table);
13	unnilennium	1.2	@@ -394,13 +394,29 @@ sub subdevices ($)
14			$disques{$i}{DEVTYPE}= "SCSI_SATA";
15	unnilennium	1.1	}
16			elsif ($udevinfo =~ /couldn\'t get the class device/)
17	unnilennium	1.2	- {
18			- $disques{$i}{DEVTYPE}= "$tr_unknown";
19			+ {
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	unnilennium	1.1	}
30			else
31			{
32			- $disques{$i}{DEVTYPE}= $udevinfo;
33	unnilennium	1.2	- }
34			+ my $infobis=`cat /proc/mdstat \|grep -o md[0-9]*`;
35			+ if ($infobis =~ /$name/)
36			+ {
37			+ $disques{$i}{DEVTYPE}= "RAID";
38			+ }
39			+ else
40			+ {
41			+ $disques{$i}{DEVTYPE}= $udevinfo;
42			+ }
43			+ }
44	unnilennium	1.1	$i++;
45			}
46	unnilennium	1.2	return %disques;