diff --git a/libguestfs.changes b/libguestfs.changes index 5fca0d0..bbae28a 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Oct 29 09:06:00 CET 2012 - ohering@suse.de +Mon Oct 29 10:19:23 CET 2012 - ohering@suse.de - add BuildRequires aaa_base to get get_kernel_version + handle get_kernel_version location in /sbin or /usr/sbin ------------------------------------------------------------------- Fri Oct 19 14:09:27 CEST 2012 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 15c4e69..a4d142c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -374,7 +374,7 @@ CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused" # If the kernel happens to have no virtio-scsi force virtio-blk usage in the tools # This is true for kernel.rpm included in 12.1 and older # Force also attach method "appliance" because constructing libvirt xml is cumbersome for virtio-blk -if /sbin/modinfo -k `/sbin/get_kernel_version /boot/vmlinuz` virtio-scsi +if /sbin/modinfo -k `env PATH=/sbin:/usr/sbin:$PATH get_kernel_version /boot/vmlinuz` virtio-scsi then : use virtio-scsi, which is the default in libguestfs default_attach_method="libvirt" @@ -538,7 +538,7 @@ test -n "$patched" -s $PWD/mkinitrd/scripts \ -i $PWD/mkinitrd mkdir mkinitrd/boot_tmp -kver=`/sbin/get_kernel_version /boot/vmlinuz` +kver=`env PATH=/sbin:/usr/sbin:$PATH get_kernel_version /boot/vmlinuz /boot/vmlinuz` arch=`arch` %ifarch %ix86 arch=i686 #?