106 lines
3.1 KiB
Diff
106 lines
3.1 KiB
Diff
--- lib/Bootloader/Core/GRUB.pm
|
|
+++ lib/Bootloader/Core/GRUB.pm
|
|
@@ -481,12 +481,12 @@
|
|
}
|
|
|
|
# resolve symlinks.....
|
|
- my $cmd = "udevinfo -q name -n $dev";
|
|
+ my $cmd = "udevadm info -q name -n $dev";
|
|
if (my $resolved_link = qx{$cmd 2> /dev/null}) {
|
|
chomp ($resolved_link);
|
|
$dev = "/dev/" . $resolved_link;
|
|
}
|
|
- $self->l_milestone ("GRUB::GrubDev2UnixDev: udevinfo returned: $dev");
|
|
+ $self->l_milestone ("GRUB::GrubDev2UnixDev: udevadm info returned: $dev");
|
|
|
|
if (defined ($partition)) {
|
|
foreach my $dev_ref (@{$self->{"partitions"}}) {
|
|
@@ -544,7 +544,7 @@
|
|
# need to be changed here
|
|
my $original = $dev;
|
|
my $kernel_dev;
|
|
- my $cmd = "udevinfo -q name -n $dev";
|
|
+ my $cmd = "udevadm info -q name -n $dev";
|
|
if ($kernel_dev = qx{$cmd 2> /dev/null}) {
|
|
chomp $kernel_dev;
|
|
$kernel_dev = "/dev/" . $kernel_dev;
|
|
@@ -574,8 +574,8 @@
|
|
}
|
|
|
|
# get the symbolic link from udev, it might be used in device.map
|
|
- # udevinfo returns a space separated list of strings
|
|
- $cmd = "udevinfo -q symlink -n $kernel_dev";
|
|
+ # udevadm info returns a space separated list of strings
|
|
+ $cmd = "udevadm info -q symlink -n $kernel_dev";
|
|
|
|
my @udev_links = split (/ /, qx{$cmd 2>/dev/null});
|
|
|
|
@@ -2249,7 +2249,7 @@
|
|
|
|
#FIXME: sf@ need handling for /dev/dm-X devices here
|
|
if ($device !~ /mapper/) {
|
|
- my $cmd = "udevinfo -q symlink -n $device";
|
|
+ my $cmd = "udevadm info -q symlink -n $device";
|
|
my @udev_links = split (/ /, qx{$cmd 2>/dev/null});
|
|
|
|
foreach $device (@udev_links) {
|
|
--- lib/Bootloader/Tools.pm
|
|
+++ lib/Bootloader/Tools.pm
|
|
@@ -241,7 +241,7 @@
|
|
$mounted = `mount /sys`;
|
|
}
|
|
# FIXME: maybe useless code
|
|
- my $cmd = "udevinfo -q name -p /block/$udev";
|
|
+ my $cmd = "udevadm info -q name -p /block/$udev";
|
|
my $dev = qx{ $cmd 2>/dev/null };
|
|
chomp ($dev);
|
|
|
|
@@ -249,7 +249,7 @@
|
|
$dev = "/dev/$dev";
|
|
}
|
|
|
|
- # Fallback in case udevinfo fails
|
|
+ # Fallback in case udevadm info fails
|
|
else {
|
|
|
|
#If $udev consists of both device and partition - e.g. "sda/sda1" -
|
|
@@ -654,7 +654,7 @@
|
|
|
|
=item
|
|
C<< $majmin = Bootloader::Tools::Udev2MajMin($udev); >>
|
|
-takes a udev device as reported from udevinfo
|
|
+takes a udev device as reported from udevadm info
|
|
returns a string containing major:minor
|
|
|
|
=cut
|
|
@@ -663,7 +663,7 @@
|
|
|
|
my $udev_dev = shift;
|
|
my $majmin;
|
|
- my $cmd = "udevinfo -qpath -n $udev_dev";
|
|
+ my $cmd = "udevadm info -qpath -n $udev_dev";
|
|
|
|
if (my $udev_path = qx{$cmd 2>/dev/null}){
|
|
chomp ($udev_path);
|
|
@@ -682,9 +682,9 @@
|
|
|
|
=item
|
|
C<< $udev_dev = Bootloader::Tools::MajMin2Udev($majmin); >>
|
|
-takes a string major:minor as reported from udevinfo
|
|
+takes a string major:minor as reported from udevadm info
|
|
returns a string containing the udev device as reported
|
|
-by udevinfo
|
|
+by udevadm info
|
|
|
|
=cut
|
|
|
|
@@ -741,7 +741,7 @@
|
|
|
|
=item
|
|
C<< $dm_dev = Bootloader::Tools::DMDev2MajMin($majmin); >>
|
|
-takes a string major:minor as reported from udevinfo
|
|
+takes a string major:minor as reported from udevadm info
|
|
returns a string containing the device as reported by
|
|
dmsetup
|
|
|