--- a/SI/ptable.pm Mon Jan 18 22:55:10 2010 +0100
+++ b/SI/ptable.pm Tue Jan 19 14:49:43 2010 +0100
@@ -19,17 +19,18 @@
# LVs (used as disk itself) too)
foreach (glob("/sys/block/*")) {
my $name = basename($_);
- verbose("device $name");
+ # verbose("device $name");
if (!-e "$_/device") {
- verbose("skipping (non-dev)\n");
+ # verbose("skipping (non-dev)\n");
next;
}
if ((grep { /ATTR{removable}/ } `udevadm info --attribute-walk --name $name`)[0] !~ /==.0./) {
- verbose("skipping (removable)\n");
+ # verbose("skipping (removable)\n");
next;
}
verbose("\n");
+ verbose("device $name\n");
die "ERR: /dev/$name does not exist. (should not happen)"
if !-e "/dev/$name";
@@ -50,7 +51,7 @@
# and let's prepare the volume entries
foreach (@sfdisk) {
- /^(\S+)\s*:.*Id=\s*(\d+)/ or next;
+ /^(\S+)\s*:.*Id=\s*([[:xdigit:]]+)/ or next;
$devs->{volume}{$1} = {
origin => "ptable",
ptable_type => $2,