rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

handle get_kernel_version location in /sbin or /usr/sbin

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=141
This commit is contained in:
Olaf Hering 2012-10-29 09:20:02 +00:00 committed by Git OBS Bridge
parent 25093f6a4e
commit ebe513f261
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libguestfs.changes
View File

@ -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 - 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 Fri Oct 19 14:09:27 CEST 2012 - ohering@suse.de

4
libguestfs.spec
View File

@ -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 # 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 # 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 # 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 then
: use virtio-scsi, which is the default in libguestfs : use virtio-scsi, which is the default in libguestfs
default_attach_method="libvirt" default_attach_method="libvirt"
@ -538,7 +538,7 @@ test -n "$patched"
-s $PWD/mkinitrd/scripts \ -s $PWD/mkinitrd/scripts \
-i $PWD/mkinitrd -i $PWD/mkinitrd
mkdir mkinitrd/boot_tmp 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` arch=`arch`
%ifarch %ix86 %ifarch %ix86
arch=i686 #? arch=i686 #?