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++; }