Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2016-02-12 11:22:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2016-02-03 10:19:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2016-02-12 11:22:15.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 6 19:16:32 UTC 2016 - [email protected] + +- Fix 0208-no_forced_virtnet.patch: + - On non-QEMU systems it returned non-zero, causing dracut to fail + - Fixed boo#965477 + - dracut.spec: Remove 90qemu-net entirely instead of disabling + - running_in_qemu was broken (reading output of >/dev/null) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.DhPTF1/_old 2016-02-12 11:22:17.000000000 +0100 +++ /var/tmp/diff_new_pack.DhPTF1/_new 2016-02-12 11:22:17.000000000 +0100 @@ -450,7 +450,6 @@ %{dracutlibdir}/modules.d/80cms %{dracutlibdir}/modules.d/81cio_ignore %{dracutlibdir}/modules.d/90livenet -%{dracutlibdir}/modules.d/90qemu-net %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt %{dracutlibdir}/modules.d/90dm ++++++ 0208-no_forced_virtnet.patch ++++++ --- /var/tmp/diff_new_pack.DhPTF1/_old 2016-02-12 11:22:18.000000000 +0100 +++ /var/tmp/diff_new_pack.DhPTF1/_new 2016-02-12 11:22:18.000000000 +0100 @@ -3,6 +3,7 @@ virtio-net without other network tools does not make sense and causes various bugs, like bsc#960669. +This patch merges 90qemu-net into 90-kernel-network-modules. --- modules.d/90kernel-network-modules/module-setup.sh | 24 ++++++++++++++++++++- @@ -19,7 +20,7 @@ +running_in_qemu() { + if type -P systemd-detect-virt >/dev/null 2>&1; then -+ vm=$(systemd-detect-virt --vm >/dev/null 2>&1) ++ vm=$(systemd-detect-virt --vm 2>&1) + (($? != 0)) && return 255 + [[ $vm = "qemu" ]] && return 0 + [[ $vm = "kvm" ]] && return 0 @@ -39,24 +40,46 @@ # called by dracut installkernel() { # Include wired net drivers, excluding wireless -@@ -63,6 +82,8 @@ installkernel() { +@@ -63,6 +82,10 @@ installkernel() { =drivers/net/ethernet \ ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs + -+ running_in_qemu && hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci ++ if running_in_qemu; then ++ hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci ++ fi } # called by dracut Index: dracut-044/modules.d/90qemu-net/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/90qemu-net/module-setup.sh -+++ dracut-044/modules.d/90qemu-net/module-setup.sh -@@ -2,6 +2,7 @@ - - # called by dracut - check() { -+ return 255 - if type -P systemd-detect-virt >/dev/null 2>&1; then - vm=$(systemd-detect-virt --vm >/dev/null 2>&1) - (($? != 0)) && return 255 ++++ /dev/null +@@ -1,27 +0,0 @@ +-#!/bin/bash +- +-# called by dracut +-check() { +- if type -P systemd-detect-virt >/dev/null 2>&1; then +- vm=$(systemd-detect-virt --vm >/dev/null 2>&1) +- (($? != 0)) && return 255 +- [[ $vm = "qemu" ]] && return 0 +- [[ $vm = "kvm" ]] && return 0 +- [[ $vm = "bochs" ]] && return 0 +- fi +- +- for i in /sys/class/dmi/id/*_vendor; do +- [[ -f $i ]] || continue +- read vendor < $i +- [[ "$vendor" == "QEMU" ]] && return 0 +- [[ "$vendor" == "Bochs" ]] && return 0 +- done +- +- return 255 +-} +- +-# called by dracut +-installkernel() { +- # qemu specific modules +- hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci +-}
