smeserver-usbdisksmanager/contribs8/smeserver-usbdisksmanager-1.0-patch1.patch

diff -up smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks.patch1 smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks
--- smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks.patch1        2007-04-09 15:58:21.000000000 -0400
+++ smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks       2012-06-26 23:12:10.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);
@@ -376,12 +376,14 @@ sub subdevices ($)
           # device type : usb ide sata/scsi
           $disques{$i}{DEVTYPE}=  "$tr_unknown";
           my $name =  $disques{$i}{name};
-          my $udevinfo    = `/usr/bin/udevinfo -a -p /sys/block/$name`   ;
-         if ($udevinfo =~ /BUS="ide"/)
+         # my $udevinfo    = `/usr/bin/udevinfo -a -p /sys/block/$name`   ;
+          # small change in udevinfo between rhel 4 and 5
+         my $udevinfo    = `/usr/bin/udevinfo -p /sys/block/$name -q env|grep "ID_BUS="|sed -e 's/^ID_//g'`   ;
+         if ($udevinfo =~ /BUS=ide/)
             {
              $disques{$i}{DEVTYPE}= "IDE";
              }
-           elsif ($udevinfo =~ /\/usb[0-9]+\//)
+           elsif ($udevinfo =~ /BUS=usb/)
              {
              $disques{$i}{DEVTYPE}= "USB";
              }
@@ -389,7 +391,7 @@ sub subdevices ($)
              {
              $disques{$i}{DEVTYPE}= "FireWire";
              }   
-          elsif ($udevinfo =~ /BUS="scsi"/)
+          elsif ($udevinfo =~ /BUS=scsi/)
             {
              $disques{$i}{DEVTYPE}= "SCSI_SATA";
              }
@@ -399,7 +401,15 @@ sub subdevices ($)
              }
            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++;
         }
1	unnilennium	1.1	diff -up smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks.patch1 smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks
2			--- smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks.patch1 2007-04-09 15:58:21.000000000 -0400
3			+++ smeserver-usbdisksmanager-1.0/root/etc/e-smith/web/functions/usbdisks 2012-06-26 23:12:10.000000000 -0400
4			@@ -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			@@ -376,12 +376,14 @@ sub subdevices ($)
14			# device type : usb ide sata/scsi
15			$disques{$i}{DEVTYPE}= "$tr_unknown";
16			my $name = $disques{$i}{name};
17			- my $udevinfo = `/usr/bin/udevinfo -a -p /sys/block/$name` ;
18			- if ($udevinfo =~ /BUS="ide"/)
19			+ # my $udevinfo = `/usr/bin/udevinfo -a -p /sys/block/$name` ;
20			+ # small change in udevinfo between rhel 4 and 5
21			+ my $udevinfo = `/usr/bin/udevinfo -p /sys/block/$name -q env\|grep "ID_BUS="\|sed -e 's/^ID_//g'` ;
22			+ if ($udevinfo =~ /BUS=ide/)
23			{
24			$disques{$i}{DEVTYPE}= "IDE";
25			}
26			- elsif ($udevinfo =~ /\/usb[0-9]+\//)
27			+ elsif ($udevinfo =~ /BUS=usb/)
28			{
29			$disques{$i}{DEVTYPE}= "USB";
30			}
31			@@ -389,7 +391,7 @@ sub subdevices ($)
32			{
33			$disques{$i}{DEVTYPE}= "FireWire";
34			}
35			- elsif ($udevinfo =~ /BUS="scsi"/)
36			+ elsif ($udevinfo =~ /BUS=scsi/)
37			{
38			$disques{$i}{DEVTYPE}= "SCSI_SATA";
39			}
40			@@ -399,7 +401,15 @@ sub subdevices ($)
41			}
42			else
43			{
44			- $disques{$i}{DEVTYPE}= $udevinfo;
45			+ my $infobis=`cat /proc/mdstat \|grep -o md[0-9]*`;
46			+ if ($infobis =~ /$name/)
47			+ {
48			+ $disques{$i}{DEVTYPE}= "RAID";
49			+ }
50			+ else
51			+ {
52			+ $disques{$i}{DEVTYPE}= $udevinfo;
53			+ }
54			}
55			$i++;
56			}