Accepting request 359888 from home:dr-yak:branches:Base:System

missing "return 0" statement that breaks building of initrd on installation not running inside qemu.

See bugzilla #965477

OBS-URL: https://build.opensuse.org/request/show/359888
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=253
This commit is contained in:
Thomas Renninger 2016-02-17 10:36:25 +00:00 committed by Git OBS Bridge
parent e0a373b391
commit 622599ad03

View File

@ -40,13 +40,15 @@ Index: dracut-044/modules.d/90kernel-network-modules/module-setup.sh
# called by dracut # called by dracut
installkernel() { installkernel() {
# Include wired net drivers, excluding wireless # Include wired net drivers, excluding wireless
@@ -63,6 +82,10 @@ installkernel() { @@ -63,6 +82,12 @@ installkernel() {
=drivers/net/ethernet \ =drivers/net/ethernet \
ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet
hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
+ +
+ if running_in_qemu; then + if running_in_qemu; then
+ hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci + hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci
+ else
+ return 0
+ fi + fi
} }