Accepting request 314859 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/314859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=73

0011-Correct-paths-for-openSUSE.patch

@@ -1,41 +0,0 @@
-From 3c3453e92ae055674bd3260a23c98d64a1f2467d Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Thu, 28 Nov 2013 10:07:59 +0100
-Subject: [PATCH] Correct paths for openSUSE
-
-openSUSE has things stored in different places, so fixup the
-paths here.
-
-Signed-off-by: Christian Rodrigues <crrodriguez@opensuse.org>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
----
- dracut.sh                          | 2 +-
- modules.d/98systemd/rescue.service | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: dracut-041/dracut.sh
-===================================================================
---- dracut-041.orig/dracut.sh	2015-03-16 17:47:39.671230783 +0100
-+++ dracut-041/dracut.sh	2015-03-16 17:47:45.231540139 +0100
-@@ -809,7 +809,7 @@
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
--[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
-+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
- [[ $tmpdir ]] || tmpdir=/var/tmp
- [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
-Index: dracut-041/modules.d/98systemd/rescue.service
-===================================================================
---- dracut-041.orig/modules.d/98systemd/rescue.service	2015-01-31 12:54:52.000000000 +0100
-+++ dracut-041/modules.d/98systemd/rescue.service	2015-03-16 17:47:45.235540363 +0100
-@@ -16,7 +16,7 @@
- Environment=DRACUT_SYSTEMD=1
- Environment=NEWROOT=/sysroot
- WorkingDirectory=/
--ExecStartPre=-/bin/plymouth quit
-+ExecStartPre=-/usr/bin/plymouth quit
- ExecStart=-/bin/sh -i -l
- ExecStopPost=-/bin/rm -f -- /.console_lock
- ExecStopPost=-/usr/bin/systemctl --fail --no-block default

0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch

@@ -20,178 +20,19 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  delete mode 100644 modules.d/40network/dhclient.conf
  delete mode 100755 modules.d/40network/kill-dhclient.sh
 
-Index: dracut-041/modules.d/40network/dhclient-script.sh
+Index: dracut-042/modules.d/40network/dhclient.conf
 ===================================================================
---- dracut-041.orig/modules.d/40network/dhclient-script.sh	2015-03-17 12:02:54.894703848 +0100
+--- dracut-042.orig/modules.d/40network/dhclient.conf	2015-06-11 17:39:47.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,154 +0,0 @@
--#!/bin/sh
--
--PATH=/usr/sbin:/usr/bin:/sbin:/bin
--
--type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
--type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
--
--# We already need a set netif here
--netif=$interface
--
--# Huh? Interface configured?
--[ -f "/tmp/net.$netif.up" ] && exit 0
--
--setup_interface() {
--    ip=$new_ip_address
--    mtu=$new_interface_mtu
--    mask=$new_subnet_mask
--    bcast=$new_broadcast_address
--    gw=${new_routers%%,*}
--    domain=$new_domain_name
--    search=$(printf -- "$new_domain_search")
--    namesrv=$new_domain_name_servers
--    hostname=$new_host_name
--    lease_time=$new_dhcp_lease_time
--
--    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
--
--    # Taken from debian dhclient-script:
--    # The 576 MTU is only used for X.25 and dialup connections
--    # where the admin wants low latency.  Such a low MTU can cause
--    # problems with UDP traffic, among other things.  As such,
--    # disallow MTUs from 576 and below by default, so that broken
--    # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
--    if [ -n "$mtu" ] && [ $mtu -gt 576 ] ; then
--        if ! ip link set $netif mtu $mtu ; then
--            ip link set $netif down
--            ip link set $netif mtu $mtu
--            linkup $netif
--        fi
--    fi
--
--    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} \
--        valid_lft ${lease_time} preferred_lft ${lease_time} \
--        dev $netif
--
--    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
--
--    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
--    if  [ -n "$namesrv" ] ; then
--        for s in $namesrv; do
--            echo nameserver $s
--        done
--    fi >> /tmp/net.$netif.resolv.conf
--
--    # Note: hostname can be fqdn OR short hostname, so chop off any
--    # trailing domain name and explicity add any domain if set.
--    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
--}
--
--setup_interface6() {
--    domain=$new_domain_name
--    search=$(printf -- "$new_domain_search")
--    namesrv=$new_domain_name_servers
--    hostname=$new_host_name
--    [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
--    [ -n "$new_max_life" ] && lease_time=$new_max_life
--    preferred_lft=$lease_time
--    [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
--
--    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
--
--    ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
--        dev ${netif} scope global \
--        ${lease_time:+valid_lft $lease_time} \
--        ${preferred_lft:+preferred_lft ${preferred_lft}}
--
--    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
--    if  [ -n "$namesrv" ] ; then
--        for s in $namesrv; do
--            echo nameserver $s
--        done
--    fi >> /tmp/net.$netif.resolv.conf
--
--    # Note: hostname can be fqdn OR short hostname, so chop off any
--    # trailing domain name and explicity add any domain if set.
--    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
--}
--
--case $reason in
--    PREINIT)
--        echo "dhcp: PREINIT $netif up"
--        linkup $netif
--        ;;
--
--    PREINIT6)
--        echo "dhcp: PREINIT $netif up"
--        linkup $netif
--        ;;
--
--    BOUND)
--        echo "dhcp: BOND setting $netif"
--        unset layer2
--        if [ -f /sys/class/net/$netif/device/layer2 ]; then
--            read layer2 < /sys/class/net/$netif/device/layer2
--        fi
--        if [ "$layer2" != "0" ]; then
--            if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
--                warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
--                exit 1
--            fi
--        fi
--        unset layer2
--        setup_interface
--        set | while read line; do
--            [ "${line#new_}" = "$line" ] && continue
--            echo "$line"
--        done >/tmp/dhclient.$netif.dhcpopts
--
--        {
--            echo '. /lib/net-lib.sh'
--            echo "setup_net $netif"
--            echo "source_hook initqueue/online $netif"
--            [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
--            echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
--        } > $hookdir/initqueue/setup_net_$netif.sh
--
--        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
--        >/tmp/net.$netif.up
--        ;;
--
--    BOUND6)
--        echo "dhcp: BOND6 setting $netif"
--        setup_interface6
--
--        set | while read line; do
--            [ "${line#new_}" = "$line" ] && continue
--            echo "$line"
--        done >/tmp/dhclient.$netif.dhcpopts
--
--        {
--            echo '. /lib/net-lib.sh'
--            echo "setup_net $netif"
--            echo "source_hook initqueue/online $netif"
--            [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
--            echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
--        } > $hookdir/initqueue/setup_net_$netif.sh
--
--        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
--        >/tmp/net.$netif.up
--        ;;
--    *) echo "dhcp: $reason";;
--esac
--
--exit 0
-Index: dracut-041/modules.d/40network/dhclient.conf
-===================================================================
---- dracut-041.orig/modules.d/40network/dhclient.conf	2015-01-31 12:54:52.000000000 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,3 +0,0 @@
 -request subnet-mask, broadcast-address, time-offset, routers,
 -        domain-name, domain-name-servers, domain-search, host-name,
 -        root-path, interface-mtu;
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:05.645160455 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-17 12:27:22.361149708 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:05.945177534 +0200
-@@ -86,21 +86,106 @@
+@@ -86,21 +86,106 @@ else
          [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
  fi
  
@@ -303,7 +144,7 @@ Index: dracut-041/modules.d/40network/ifup.sh
  }
  
  load_ipv6() {
-@@ -226,8 +311,6 @@
+@@ -226,8 +311,6 @@ if [ -e /tmp/team.info ]; then
      fi
  fi
  
@@ -312,9 +153,9 @@ Index: dracut-041/modules.d/40network/ifup.sh
  if [ -e /tmp/bridge.info ]; then
      . /tmp/bridge.info
  # start bridge if necessary
-Index: dracut-041/modules.d/40network/kill-dhclient.sh
+Index: dracut-042/modules.d/40network/kill-dhclient.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/kill-dhclient.sh	2015-03-17 12:02:54.906704510 +0100
+--- dracut-042.orig/modules.d/40network/kill-dhclient.sh	2015-06-11 17:39:47.000000000 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,15 +0,0 @@
 -#!/bin/sh
@@ -332,10 +173,10 @@ Index: dracut-041/modules.d/40network/kill-dhclient.sh
 -    read PID < $f;
 -    kill -9 $PID >/dev/null 2>&1
 -done
-Index: dracut-041/modules.d/40network/module-setup.sh
+Index: dracut-042/modules.d/40network/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/module-setup.sh	2015-03-17 12:02:55.006710127 +0100
+--- dracut-042.orig/modules.d/40network/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/module-setup.sh	2015-03-17 12:37:51.868466193 +0100
++++ dracut-042/modules.d/40network/module-setup.sh	2015-06-24 18:02:05.949177762 +0200
 @@ -1,10 +1,13 @@
  #!/bin/bash
  
@@ -351,7 +192,7 @@ Index: dracut-041/modules.d/40network/module-setup.sh
  
      return 255
  }
-@@ -71,17 +74,18 @@
+@@ -23,17 +26,18 @@ installkernel() {
  # called by dracut
  install() {
      local _arch _i _dir
@@ -374,7 +215,7 @@ Index: dracut-041/modules.d/40network/module-setup.sh
      inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
      inst_hook pre-udev 60 "$moddir/net-genrules.sh"
      inst_hook cmdline 91 "$moddir/dhcp-root.sh"
-@@ -92,7 +96,6 @@
+@@ -44,7 +48,6 @@ install() {
      inst_hook cmdline 97 "$moddir/parse-bridge.sh"
      inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
      inst_hook cmdline 99 "$moddir/parse-ifname.sh"

0016-Add-new-s390x-specific-rule-files.patch

@@ -15,10 +15,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/module-setup.sh | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)
 
-Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
+Index: dracut-042/modules.d/95dasd_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95dasd_rules/module-setup.sh	2015-03-17 12:38:30.046605162 +0100
++++ dracut-042/modules.d/95dasd_rules/module-setup.sh	2015-06-24 18:02:06.297197575 +0200
 @@ -4,7 +4,7 @@
  check() {
      local _arch=$(uname -m)
@@ -28,7 +28,7 @@ Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
      return 0
  }
  
-@@ -16,10 +16,10 @@
+@@ -16,10 +16,10 @@ depends() {
  
  # called by dracut
  install() {
@@ -40,11 +40,11 @@ Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
      fi
      inst_rules 59-dasd.rules
  }
-Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
+Index: dracut-042/modules.d/95zfcp_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95zfcp_rules/module-setup.sh	2015-03-17 12:38:30.050605397 +0100
++++ dracut-042/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:06.297197575 +0200
-@@ -19,5 +19,6 @@
+@@ -19,5 +19,6 @@ install() {
      inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
      if [[ $hostonly ]] ; then
          inst_rules_wildcard 51-zfcp-*.rules

0017-45ifcfg-use-distro-specific-scripts.patch

@@ -16,11 +16,11 @@ Modified-by: Thomas Rennigner <trenn@suse.de>
  modules.d/45ifcfg/module-setup.sh | 8 +++++++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-17 12:38:28.586523363 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:05.945177534 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-17 12:38:48.851658757 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:06.605215110 +0200
-@@ -184,6 +184,7 @@
+@@ -184,6 +184,7 @@ do_dhcp() {
      $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
      dhcp_apply $1 || return $?
  
@@ -28,10 +28,10 @@ Index: dracut-041/modules.d/40network/ifup.sh
      echo $netif > /tmp/setup_net_${netif}.ok
      return 0
  }
-Index: dracut-041/modules.d/45ifcfg/module-setup.sh
+Index: dracut-042/modules.d/45ifcfg/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/45ifcfg/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/45ifcfg/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/45ifcfg/module-setup.sh	2015-03-17 12:38:48.851658757 +0100
++++ dracut-042/modules.d/45ifcfg/module-setup.sh	2015-06-24 18:02:06.605215110 +0200
 @@ -2,7 +2,13 @@
  
  # called by dracut

0019-40network-Fix-race-condition-when-wait-for-networks.patch

@@ -17,11 +17,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/net-genrules.sh | 3 +++
  1 file changed, 3 insertions(+)
 
-Index: dracut-041/modules.d/40network/net-genrules.sh
+Index: dracut-042/modules.d/40network/net-genrules.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/net-genrules.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/40network/net-genrules.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/net-genrules.sh	2015-03-17 12:38:55.044006007 +0100
++++ dracut-042/modules.d/40network/net-genrules.sh	2015-06-24 18:02:05.357144086 +0200
-@@ -96,6 +96,9 @@
+@@ -96,6 +96,9 @@ command -v fix_bootif >/dev/null || . /l
          cond='ACTION=="add", SUBSYSTEM=="net"'
          # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
          echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules

0020-00warpclock-Set-correct-timezone.patch

@@ -15,10 +15,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  create mode 100755 modules.d/00warpclock/module-setup.sh
  create mode 100755 modules.d/00warpclock/warpclock.sh
 
-Index: dracut-041/modules.d/00warpclock/module-setup.sh
+Index: dracut-042/modules.d/00warpclock/module-setup.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/00warpclock/module-setup.sh	2015-03-24 15:18:51.564135423 +0100
++++ dracut-042/modules.d/00warpclock/module-setup.sh	2015-06-24 18:02:06.917232873 +0200
 @@ -0,0 +1,27 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -47,10 +47,10 @@ Index: dracut-041/modules.d/00warpclock/module-setup.sh
 +    inst_hook pre-trigger 00 "$moddir/warpclock.sh"
 +    inst /sbin/hwclock
 +}
-Index: dracut-041/modules.d/00warpclock/warpclock.sh
+Index: dracut-042/modules.d/00warpclock/warpclock.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/00warpclock/warpclock.sh	2015-03-24 15:07:47.762852198 +0100
++++ dracut-042/modules.d/00warpclock/warpclock.sh	2015-06-24 18:02:06.917232873 +0200
 @@ -0,0 +1,9 @@
 +#!/bin/sh
 +

0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch

@@ -16,11 +16,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  create mode 100755 modules.d/95dcssblk/module-setup.sh
  create mode 100755 modules.d/95dcssblk/parse-dcssblk.sh
 
-diff --git a/modules.d/95dcssblk/module-setup.sh b/modules.d/95dcssblk/module-setup.sh
+Index: dracut-042/modules.d/95dcssblk/module-setup.sh
-new file mode 100755
+===================================================================
-index 0000000..11e3849
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/95dcssblk/module-setup.sh	2015-06-24 18:02:07.217249953 +0200
-+++ b/modules.d/95dcssblk/module-setup.sh
 @@ -0,0 +1,28 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -50,11 +49,10 @@ index 0000000..11e3849
 +    #    inst /etc/dcssblk.conf
 +    #fi
 +}
-diff --git a/modules.d/95dcssblk/parse-dcssblk.sh b/modules.d/95dcssblk/parse-dcssblk.sh
+Index: dracut-042/modules.d/95dcssblk/parse-dcssblk.sh
-new file mode 100755
+===================================================================
-index 0000000..8f17440
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/95dcssblk/parse-dcssblk.sh	2015-06-24 18:02:07.217249953 +0200
-+++ b/modules.d/95dcssblk/parse-dcssblk.sh
 @@ -0,0 +1,8 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -64,6 +62,3 @@ index 0000000..8f17440
 +	info "Loading dcssblk segments=$dcssblk_arg"
 +	modprobe dcssblk segments=$dcssblk_arg
 +fi
--- 
-1.8.1.4
-

0048-40network-Only-enable-network-interfaces-if-explicit.patch

@@ -16,11 +16,11 @@ Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
  modules.d/40network/net-genrules.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/40network/net-genrules.sh
+Index: dracut-042/modules.d/40network/net-genrules.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/net-genrules.sh	2015-03-24 15:07:37.138255549 +0100
+--- dracut-042.orig/modules.d/40network/net-genrules.sh	2015-06-24 18:02:05.357144086 +0200
-+++ dracut-041/modules.d/40network/net-genrules.sh	2015-03-24 15:09:13.415662323 +0100
++++ dracut-042/modules.d/40network/net-genrules.sh	2015-06-24 18:02:07.521267259 +0200
-@@ -95,8 +95,8 @@
+@@ -95,8 +95,8 @@ command -v fix_bootif >/dev/null || . /l
      else
          cond='ACTION=="add", SUBSYSTEM=="net"'
          # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh

0053-01fips-fixup-loading-issues.patch

@@ -13,11 +13,11 @@ Signed-off-by: Marcus Meissner <meissner@suse.de>
  modules.d/01fips/module-setup.sh | 12 +++++++++---
  2 files changed, 21 insertions(+), 3 deletions(-)
 
-Index: dracut-041/modules.d/01fips/fips.sh
+Index: dracut-042/modules.d/01fips/fips.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/fips.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/01fips/fips.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/01fips/fips.sh	2015-03-17 12:57:54.755887866 +0100
++++ dracut-042/modules.d/01fips/fips.sh	2015-06-24 18:02:07.817284113 +0200
-@@ -98,6 +98,18 @@
+@@ -98,6 +98,18 @@ do_fips()
                      _found=1
                      break
                  done </proc/crypto
@@ -36,26 +36,20 @@ Index: dracut-041/modules.d/01fips/fips.sh
                  [ "$_found" = "0" ] && return 1
              fi
          fi
-Index: dracut-041/modules.d/01fips/module-setup.sh
+Index: dracut-042/modules.d/01fips/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/module-setup.sh	2015-03-17 12:57:54.439870155 +0100
+--- dracut-042.orig/modules.d/01fips/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/01fips/module-setup.sh	2015-03-17 12:57:54.755887866 +0100
++++ dracut-042/modules.d/01fips/module-setup.sh	2015-06-24 18:02:07.817284113 +0200
-@@ -16,8 +16,12 @@
+@@ -19,6 +19,8 @@ installkernel() {
-     _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+     _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
-     _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+     _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
-     _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+     _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
--    _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
--    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
-+    _fipsmodules+="rmd160 rmd256 rmd320 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
-+    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib "
 +    _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "                      
 +    _fipsmodules+="ghash-clmulni-intel "                                       
-+
-+    # once it is in the kernel: _fipsmodules+="drbg "
  
      mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
  
-@@ -43,7 +47,9 @@
+@@ -44,7 +46,9 @@ install() {
          libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
          libfreeblpriv3.so libfreeblpriv3.chk
  

0056-81cio_ignore-handle-cio_ignore-commandline.patch

@@ -32,11 +32,11 @@ commandline files.
 
 
 Signed-off-by: Thomas Renninger <trenn@suse.de>
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
+Index: dracut-042/dracut.cmdline.7.asc
-index e51fd1b..0e3e5a0 100644
+===================================================================
---- a/dracut.cmdline.7.asc
+--- dracut-042.orig/dracut.cmdline.7.asc	2015-06-11 17:39:47.000000000 +0200
-+++ b/dracut.cmdline.7.asc
++++ dracut-042/dracut.cmdline.7.asc	2015-06-24 18:02:08.125301648 +0200
-@@ -857,6 +857,21 @@ NOTE: There must be enough free RAM available to hold the complete image.
+@@ -869,6 +869,21 @@ NOTE: There must be enough free RAM avai
  This method is very suitable for diskless boots.
  
  
@@ -58,11 +58,10 @@ index e51fd1b..0e3e5a0 100644
  Plymouth Boot Splash
  ~~~~~~~~~~~~~~~~~~~~
  **plymouth.enable=0**::
-diff --git a/modules.d/81cio_ignore/module-setup.sh b/modules.d/81cio_ignore/module-setup.sh
+Index: dracut-042/modules.d/81cio_ignore/module-setup.sh
-new file mode 100644
+===================================================================
-index 0000000..37b414b
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/81cio_ignore/module-setup.sh	2015-06-24 18:02:08.125301648 +0200
-+++ b/modules.d/81cio_ignore/module-setup.sh
 @@ -0,0 +1,40 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -104,11 +103,10 @@ index 0000000..37b414b
 +    inst_hook cmdline 20 "$moddir/parse-cio_accept.sh"
 +    inst_multiple cio_ignore
 +}
-diff --git a/modules.d/81cio_ignore/parse-cio_accept.sh b/modules.d/81cio_ignore/parse-cio_accept.sh
+Index: dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh
-new file mode 100644
+===================================================================
-index 0000000..4f899d2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh	2015-06-24 18:02:08.125301648 +0200
-+++ b/modules.d/81cio_ignore/parse-cio_accept.sh
 @@ -0,0 +1,22 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-

0057-01fips-Include-some-more-hmacs.patch

@@ -12,11 +12,11 @@ Signed-off-by: Marcus Meissner <meissner@suse.de>
  modules.d/01fips/module-setup.sh | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/01fips/module-setup.sh
+Index: dracut-042/modules.d/01fips/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/module-setup.sh	2015-03-17 13:00:19.375997364 +0100
+--- dracut-042.orig/modules.d/01fips/module-setup.sh	2015-06-24 18:02:07.817284113 +0200
-+++ dracut-041/modules.d/01fips/module-setup.sh	2015-03-17 13:02:40.739924966 +0100
++++ dracut-042/modules.d/01fips/module-setup.sh	2015-06-24 18:02:08.453320321 +0200
-@@ -45,6 +45,10 @@
+@@ -44,6 +44,10 @@ install() {
      inst_libdir_file libsoftokn3.so libsoftokn3.so \
          libsoftokn3.chk libfreebl3.so libfreebl3.chk \
          libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \

0058-dracut-add-warning-when-including-unsupported-module.patch

@@ -25,11 +25,11 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  dracut.sh           |  5 +++++
  3 files changed, 37 insertions(+)
 
-Index: dracut-041/dracut-functions.sh
+Index: dracut-042/dracut-functions.sh
 ===================================================================
---- dracut-041.orig/dracut-functions.sh	2015-03-17 13:03:05.977340283 +0100
+--- dracut-042.orig/dracut-functions.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/dracut-functions.sh	2015-03-17 13:04:36.570421062 +0100
++++ dracut-042/dracut-functions.sh	2015-06-24 18:02:08.741336717 +0200
-@@ -1436,6 +1436,17 @@
+@@ -1436,6 +1436,17 @@ for_each_module_dir() {
      done
  }
  
@@ -47,7 +47,7 @@ Index: dracut-041/dracut-functions.sh
  # Install a single kernel module along with any firmware it may require.
  # $1 = full path to kernel module to install
  install_kmod_with_fw() {
-@@ -1498,6 +1509,10 @@
+@@ -1498,6 +1509,10 @@ install_kmod_with_fw() {
              fi
          fi
      done
@@ -58,7 +58,7 @@ Index: dracut-041/dracut-functions.sh
      return 0
  }
  
-@@ -1544,6 +1559,12 @@
+@@ -1544,6 +1559,12 @@ dracut_kernel_post() {
                      inst_simple "$_modpath" "/lib/modules/$kernel/${_destpath}" || exit $?
                  done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
              fi
@@ -69,15 +69,15 @@ Index: dracut-041/dracut-functions.sh
 +                done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
 +            fi
          ) &
-         _pid=$(jobs -p | while read a ; do printf ":$a";done)
+         _pid=$(jobs -p | while read a  || [ -n "$a" ]; do printf ":$a";done)
          _pid=${_pid##*:}
-Index: dracut-041/dracut.8.asc
+Index: dracut-042/dracut.8.asc
 ===================================================================
---- dracut-041.orig/dracut.8.asc	2015-03-17 13:03:05.985340731 +0100
+--- dracut-042.orig/dracut.8.asc	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/dracut.8.asc	2015-03-17 13:04:36.574421286 +0100
++++ dracut-042/dracut.8.asc	2015-06-24 18:02:08.741336717 +0200
-@@ -465,6 +465,17 @@
+@@ -479,6 +479,17 @@ will not be able to boot.
- **--loginstall _<DIR>_::
+     Specifies the kernel image, which to include in the UEFI executable. The default is
-     Log all files installed from the host to _<DIR>_.
+     _/lib/modules/<KERNEL-VERSION>/vmlinuz_ or _/boot/vmlinuz-<KERNEL-VERSION>_
  
 +**--check-supported**::
 +    The kernel may be configured to check whether a module is
@@ -93,11 +93,11 @@ Index: dracut-041/dracut.8.asc
  FILES
  -----
  _/var/log/dracut.log_::
-Index: dracut-041/dracut.sh
+Index: dracut-042/dracut.sh
 ===================================================================
---- dracut-041.orig/dracut.sh	2015-03-17 13:04:36.578421510 +0100
+--- dracut-042.orig/dracut.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/dracut.sh	2015-03-17 13:05:51.022596862 +0100
++++ dracut-042/dracut.sh	2015-06-24 18:02:08.745336946 +0200
-@@ -193,6 +193,9 @@
+@@ -193,6 +193,9 @@ Creates initial ramdisk images for prelo
    --printsize           Print out the module install size
    --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
    --logfile [FILE]      Logfile to use (overrides configuration setting)
@@ -106,20 +106,20 @@ Index: dracut-041/dracut.sh
 +                        support status of a module before loading.
    --reproducible        Create reproducible images
    --loginstall [DIR]    Log all files installed from the host to [DIR]
- 
+   --uefi                Create an UEFI executable with the kernel cmdline and
-@@ -387,6 +390,7 @@
+@@ -391,6 +394,7 @@ rearrange_params()
          --long noimageifnotneeded \
          --long early-microcode \
          --long no-early-microcode \
 +        --long check-supported \
          --long reproducible \
          --long loginstall: \
-         -- "$@")
+         --long uefi \
-@@ -576,6 +580,7 @@
+@@ -583,6 +587,7 @@ while :; do
          --printsize)   printsize="yes";;
          --regenerate-all) regenerate_all="yes";;
          --noimageifnotneeded) noimageifnotneeded="yes";;
 +        --check-supported) check_supported="yes" ;;
          --reproducible) reproducible_l="yes";;
-         --) shift; break;;
+         --uefi)        uefi="yes";;
- 
+         --uefi-stub)

0059-99suse-Add-SUSE-specific-initrd-parsing.patch

@@ -13,11 +13,10 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  create mode 100755 modules.d/99suse/module-setup.sh
  create mode 100755 modules.d/99suse/parse-suse-initrd.sh
 
-diff --git a/modules.d/99suse/module-setup.sh b/modules.d/99suse/module-setup.sh
+Index: dracut-042/modules.d/99suse/module-setup.sh
-new file mode 100755
+===================================================================
-index 0000000..06afba8
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/99suse/module-setup.sh	2015-06-24 18:02:09.081356075 +0200
-+++ b/modules.d/99suse/module-setup.sh
 @@ -0,0 +1,8 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -27,11 +26,10 @@ index 0000000..06afba8
 +install() {
 +    inst_hook cmdline 99 "$moddir/parse-suse-initrd.sh"
 +}
-diff --git a/modules.d/99suse/parse-suse-initrd.sh b/modules.d/99suse/parse-suse-initrd.sh
+Index: dracut-042/modules.d/99suse/parse-suse-initrd.sh
-new file mode 100755
+===================================================================
-index 0000000..542171b
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/99suse/parse-suse-initrd.sh	2015-06-24 18:02:09.081356075 +0200
-+++ b/modules.d/99suse/parse-suse-initrd.sh
 @@ -0,0 +1,51 @@
 +#!/bin/sh
 +# convert openSUSE / SLE initrd command lines into dracut ones
@@ -84,6 +82,3 @@ index 0000000..542171b
 +    echo "netroot=iscsi:$TargetAddress::$TargetPort::$TargetName" >> /etc/cmdline.d/99-suse.conf
 +    unset CMDLINE
 +fi
--- 
-1.8.4.5
-

0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch

@@ -9,11 +9,10 @@ Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.com>
  1 file changed, 183 insertions(+)
  create mode 100755 modules.d/45ifcfg/write-ifcfg-suse.sh
 
-diff --git a/modules.d/45ifcfg/write-ifcfg-suse.sh b/modules.d/45ifcfg/write-ifcfg-suse.sh
+Index: dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh
-new file mode 100755
+===================================================================
-index 0000000..4b6350f
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
---- /dev/null
++++ dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh	2015-06-24 18:02:09.389373610 +0200
-+++ b/modules.d/45ifcfg/write-ifcfg-suse.sh
 @@ -0,0 +1,183 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -198,6 +197,3 @@ index 0000000..4b6350f
 +    copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network
 +    cp /tmp/leaseinfo.* /run/initramfs/state/var/run/wicked/
 +} > /dev/null 2>&1
--- 
-1.8.4.5
-

0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch

@@ -13,10 +13,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/45ifcfg/write-ifcfg-suse.sh | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/modules.d/45ifcfg/write-ifcfg-suse.sh b/modules.d/45ifcfg/write-ifcfg-suse.sh
+Index: dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh
-index 4b6350f..e9b4d10 100755
+===================================================================
---- a/modules.d/45ifcfg/write-ifcfg-suse.sh
+--- dracut-042.orig/modules.d/45ifcfg/write-ifcfg-suse.sh	2015-06-24 18:02:09.389373610 +0200
-+++ b/modules.d/45ifcfg/write-ifcfg-suse.sh
++++ dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh	2015-06-24 18:02:09.677390007 +0200
 @@ -32,6 +32,7 @@ for netup in /tmp/net.*.did-setup ; do
  
      netif=${netup%%.did-setup}
@@ -35,6 +35,3 @@ index 4b6350f..e9b4d10 100755
      {
          echo "# Generated by dracut initrd"
          echo "NAME='$netif'"
--- 
-1.8.4.5
-

0066-40network-always-start-netroot-in-ifup.sh.patch

@@ -16,11 +16,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/ifup.sh | 22 ++++++++--------------
  1 file changed, 8 insertions(+), 14 deletions(-)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-24 15:07:37.946300922 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:05.645160455 +0200
-@@ -338,21 +338,15 @@
+@@ -338,21 +338,15 @@ for p in $(getargs ip=); do
          esac
      done
  

0068-95fcoe-uefi-Test-for-EFI-firmware.patch

@@ -1,30 +0,0 @@
-From df4d0bb82b7571d0230abbae8b918373b62fdb74 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Mon, 16 Jun 2014 14:10:48 +0200
-Subject: 95fcoe-uefi: Test for EFI firmware
-
-The fcoe-uefi module should test for EFI firmware when called
-in 'hostonly' mode; of no EFI firmware is found then the module
-doesn't need to be included.
-
-References: bnc#882412
-
-Signed-off-by: Hannes Reinecke <hare@suse.de>
----
- modules.d/95fcoe-uefi/module-setup.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: dracut-041/modules.d/95fcoe-uefi/module-setup.sh
-===================================================================
---- dracut-041.orig/modules.d/95fcoe-uefi/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
-+++ dracut-041/modules.d/95fcoe-uefi/module-setup.sh	2015-03-24 15:07:41.762515236 +0100
-@@ -2,6 +2,9 @@
- 
- # called by dracut
- check() {
-+    [[ $hostonly ]] || [[ $mount_needs ]] && {
-+        [ -d /sys/firmware/efi ] || return 255
-+    }
-     require_binaries dcbtool fipvlan lldpad ip readlink || return 1
-     return 0
- }

0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch

@@ -11,11 +11,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/parse-dasd.sh | 37 ++++++++++++++++++++++++++++++++++++
  1 file changed, 37 insertions(+)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:13:29.674054260 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:13:36.566441368 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:09.969406631 +0200
-@@ -52,3 +52,40 @@
+@@ -52,3 +52,40 @@ for dasd_arg in $(getargs root=) $(getar
          fi
      )
  done

0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/parse-zfcp.sh | 3 +++
  2 files changed, 6 insertions(+)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:13:36.566441368 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:09.969406631 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:13:39.238591451 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:10.257423027 +0200
-@@ -36,6 +36,9 @@
+@@ -36,6 +36,9 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=
  ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv"
  ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1"
  EOF
@@ -27,11 +27,11 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
  }
  
  for dasd_arg in $(getargs root=) $(getargs resume=); do
-Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
+Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-24 15:13:26.593881271 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-24 15:13:39.238591451 +0100
++++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:10.257423027 +0200
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,9 @@ EOF
  ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun"
  EOF
      fi

0079-95dasd_rules-fixup-rd.dasd-parsing.patch

@@ -12,11 +12,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/parse-dasd.sh | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-17 13:19:07.747002492 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:10.257423027 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-17 13:19:29.908237657 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:10.589441929 +0200
-@@ -29,6 +29,10 @@
+@@ -29,6 +29,10 @@ create_udev_rule() {
      esac
      [ -z "${_drv}" ] && return 0
  
@@ -27,7 +27,7 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
      [ -e ${_rule} ] && return 0
  
      cat > $_rule <<EOF
-@@ -36,9 +40,6 @@
+@@ -36,9 +40,6 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=
  ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv"
  ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1"
  EOF
@@ -37,7 +37,7 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
  }
  
  for dasd_arg in $(getargs root=) $(getargs resume=); do
-@@ -46,7 +47,7 @@
+@@ -46,7 +47,7 @@ for dasd_arg in $(getargs root=) $(getar
          case $dasd_arg in
              /dev/disk/by-path/ccw-*)
                  ccw_arg=${dasd_arg##*/}
@@ -46,7 +46,7 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
          esac
          if [ -n "$ccw_arg" ] ; then
              IFS="-"
-@@ -75,8 +76,8 @@
+@@ -75,8 +76,8 @@ for dasd_arg in $(getargs rd.dasd=); do
                      end=${1#0.0.}
                      shift
                      unset IFS
@@ -57,7 +57,7 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
                      done
                      ;;
                  *)
-@@ -85,7 +86,7 @@
+@@ -85,7 +86,7 @@ for dasd_arg in $(getargs rd.dasd=); do
                          ro=1
                      fi
                      dev=${dev#0.0.}

0080-95dasd_rules-print-out-rd.dasd-commandline.patch

@@ -14,10 +14,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/module-setup.sh | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
-Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
+Index: dracut-042/modules.d/95dasd_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh	2015-03-17 13:19:49.341320467 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/module-setup.sh	2015-06-24 18:02:06.297197575 +0200
-+++ dracut-041/modules.d/95dasd_rules/module-setup.sh	2015-03-17 13:19:49.873350116 +0100
++++ dracut-042/modules.d/95dasd_rules/module-setup.sh	2015-06-24 18:02:10.881458552 +0200
 @@ -1,10 +1,39 @@
  #!/bin/bash
  
@@ -58,7 +58,7 @@ Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
      return 0
  }
  
-@@ -17,6 +46,10 @@
+@@ -17,6 +46,10 @@ depends() {
  # called by dracut
  install() {
      inst_hook cmdline 30 "$moddir/parse-dasd.sh"

0081-95dasd_mod-do-not-set-module-parameters-if-dasd_cio_.patch

@@ -12,11 +12,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_mod/parse-dasd-mod.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh
+Index: dracut-042/modules.d/95dasd_mod/parse-dasd-mod.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_mod/parse-dasd-mod.sh	2015-03-24 15:14:11.284391294 +0100
+--- dracut-042.orig/modules.d/95dasd_mod/parse-dasd-mod.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh	2015-03-24 15:14:27.173283690 +0100
++++ dracut-042/modules.d/95dasd_mod/parse-dasd-mod.sh	2015-06-24 18:02:11.169474949 +0200
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ done
  
  mod_args="${mod_args#*,}"
  

0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch

@@ -11,11 +11,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/parse-zfcp.sh | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
+Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 13:20:19.735014330 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:10.257423027 +0200
-+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 13:20:19.835019903 +0100
++++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:11.461491574 +0200
-@@ -5,9 +5,7 @@
+@@ -5,9 +5,7 @@ create_udev_rule() {
      local wwpn=$2
      local lun=$3
      local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
@@ -25,7 +25,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
  
      if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
          read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
-@@ -20,6 +18,10 @@
+@@ -20,6 +18,10 @@ create_udev_rule() {
          return 0;
      fi
  
@@ -36,7 +36,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
      [ -e ${_rule} ] && return 0
  
      if [ ! -f "$_rule" ] ; then
-@@ -35,9 +37,6 @@
+@@ -35,9 +37,6 @@ EOF
  ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun"
  EOF
      fi
@@ -46,7 +46,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
  }
  
  for zfcp_arg in $(getargs rd.zfcp); do
-@@ -53,7 +52,7 @@
+@@ -53,7 +52,7 @@ for zfcp_arg in $(getargs root=) $(getar
          case $zfcp_arg in
              /dev/disk/by-path/ccw-*)
                  ccw_arg=${zfcp_arg##*/}

0085-95zfcp_rules-print-out-rd.zfcp-commandline-parameter.patch

@@ -11,10 +11,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/module-setup.sh | 39 +++++++++++++++++++++++++++++++++-
  1 file changed, 38 insertions(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
+Index: dracut-042/modules.d/95zfcp_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh	2015-03-17 13:20:39.928139743 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:06.297197575 +0200
-+++ dracut-041/modules.d/95zfcp_rules/module-setup.sh	2015-03-17 13:20:40.528173186 +0100
++++ dracut-042/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:11.753508198 +0200
 @@ -1,10 +1,40 @@
  #!/bin/bash
  
@@ -57,7 +57,7 @@ Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
      return 0
  }
  
-@@ -17,6 +47,13 @@
+@@ -17,6 +47,13 @@ depends() {
  install() {
      inst_multiple /usr/lib/udev/collect
      inst_hook cmdline 30 "$moddir/parse-zfcp.sh"

0086-95zfcp_rules-Auto-generate-udev-rule-for-ipl-device.patch

@@ -11,11 +11,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/parse-zfcp.sh | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
+Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 13:21:03.397447784 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:11.461491574 +0200
-+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 13:29:52.590839805 +0100
++++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:12.041524595 +0200
-@@ -39,6 +39,17 @@
+@@ -39,6 +39,17 @@ EOF
      fi
  }
  
@@ -33,7 +33,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
  for zfcp_arg in $(getargs rd.zfcp); do
      (
          IFS=","
-@@ -49,6 +60,9 @@
+@@ -49,6 +60,9 @@ done
  
  for zfcp_arg in $(getargs root=) $(getargs resume=); do
      (
@@ -43,7 +43,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
          case $zfcp_arg in
              /dev/disk/by-path/ccw-*)
                  ccw_arg=${zfcp_arg##*/}
-@@ -57,8 +71,8 @@
+@@ -57,8 +71,8 @@ for zfcp_arg in $(getargs root=) $(getar
          if [ -n "$ccw_arg" ] ; then
              IFS="-"
              set -- $ccw_arg

0087-95dasd_rules-Auto-generate-udev-rule-for-ipl-device.patch

@@ -11,11 +11,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/parse-dasd.sh | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:10.763731992 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:10.589441929 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:19.484221789 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:12.329540991 +0200
-@@ -42,6 +42,15 @@
+@@ -42,6 +42,15 @@ ACTION=="add", ENV{COLLECT_$ccw}=="0", A
  EOF
  }
  

0088-91zipl-Add-new-module-to-update-s390x-configuration.patch

@@ -19,11 +19,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  create mode 100644 modules.d/91zipl/module-setup.sh
  create mode 100644 modules.d/91zipl/parse-zipl.sh
 
-Index: dracut-041/dracut.cmdline.7.asc
+Index: dracut-042/dracut.cmdline.7.asc
 ===================================================================
---- dracut-041.orig/dracut.cmdline.7.asc	2015-03-24 15:15:10.423712894 +0100
+--- dracut-042.orig/dracut.cmdline.7.asc	2015-06-24 18:02:08.125301648 +0200
-+++ dracut-041/dracut.cmdline.7.asc	2015-03-24 15:15:22.356383108 +0100
++++ dracut-042/dracut.cmdline.7.asc	2015-06-24 18:02:12.621557615 +0200
-@@ -872,6 +872,20 @@
+@@ -884,6 +884,20 @@ CIO_IGNORE
  rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802
  --
  
@@ -44,10 +44,10 @@ Index: dracut-041/dracut.cmdline.7.asc
  Plymouth Boot Splash
  ~~~~~~~~~~~~~~~~~~~~
  **plymouth.enable=0**::
-Index: dracut-041/modules.d/91zipl/install_zipl_cmdline.sh
+Index: dracut-042/modules.d/91zipl/install_zipl_cmdline.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/91zipl/install_zipl_cmdline.sh	2015-03-24 15:15:22.356383108 +0100
++++ dracut-042/modules.d/91zipl/install_zipl_cmdline.sh	2015-06-24 18:02:12.621557615 +0200
 @@ -0,0 +1,33 @@
 +#!/bin/bash
 +
@@ -82,10 +82,10 @@ Index: dracut-041/modules.d/91zipl/install_zipl_cmdline.sh
 +> /tmp/install.zipl.cmdline-done
 +
 +exit 0
-Index: dracut-041/modules.d/91zipl/module-setup.sh
+Index: dracut-042/modules.d/91zipl/module-setup.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/91zipl/module-setup.sh	2015-03-24 15:15:22.356383108 +0100
++++ dracut-042/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:12.621557615 +0200
 @@ -0,0 +1,45 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -132,10 +132,10 @@ Index: dracut-041/modules.d/91zipl/module-setup.sh
 +    fi
 +    dracut_need_initqueue
 +}
-Index: dracut-041/modules.d/91zipl/parse-zipl.sh
+Index: dracut-042/modules.d/91zipl/parse-zipl.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/91zipl/parse-zipl.sh	2015-03-24 15:15:22.356383108 +0100
++++ dracut-042/modules.d/91zipl/parse-zipl.sh	2015-06-24 18:02:12.621557615 +0200
 @@ -0,0 +1,41 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-

0089-40network-create-var-lib-wicked-in-ifup.sh.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/ifup.sh | 2 ++
  1 file changed, 2 insertions(+)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-24 15:15:10.003689302 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:06.605215110 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-24 15:15:25.332550269 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:12.961576972 +0200
-@@ -18,6 +18,8 @@
+@@ -18,6 +18,8 @@ netif=$1
  use_bridge='false'
  use_vlan='false'
  

0090-dracut-caps-Remove-whole-caps-module.patch

@@ -17,9 +17,9 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  delete mode 100755 modules.d/02caps/caps.sh
  delete mode 100755 modules.d/02caps/module-setup.sh
 
-Index: dracut-041/modules.d/02caps/README
+Index: dracut-042/modules.d/02caps/README
 ===================================================================
---- dracut-041.orig/modules.d/02caps/README	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/02caps/README	2015-06-11 17:39:47.000000000 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,33 +0,0 @@
 -This adds the following parameters:
@@ -55,9 +55,38 @@ Index: dracut-041/modules.d/02caps/README
 -  jbd mbcache sd_mod crc_t10dif sr_mod cdrom ata_generic pata_acpi ata_piix
 -  dm_mod" \
 -  /boot/initramfs-caps.img
-Index: dracut-041/modules.d/02caps/caps.sh
+Index: dracut-042/modules.d/02caps/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/02caps/caps.sh	2015-03-17 13:30:53.230199929 +0100
+--- dracut-042.orig/modules.d/02caps/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,24 +0,0 @@
+-#!/bin/bash
+-
+-# called by dracut
+-check() {
+-    require_binaries capsh
+-}
+-
+-# called by dracut
+-depends() {
+-    return 0
+-}
+-
+-# called by dracut
+-install() {
+-    if ! dracut_module_included "systemd"; then
+-        inst_hook pre-pivot 00 "$moddir/caps.sh"
+-        inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
+-        # capsh wants bash and we need bash also
+-        inst /bin/bash
+-    else
+-        dwarning "caps: does not work with systemd in the initramfs"
+-    fi
+-}
+-
+Index: dracut-042/modules.d/02caps/caps.sh
+===================================================================
+--- dracut-042.orig/modules.d/02caps/caps.sh	2015-06-11 17:39:47.000000000 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,34 +0,0 @@
 -#!/bin/bash
@@ -66,7 +95,7 @@ Index: dracut-041/modules.d/02caps/caps.sh
 -
 -if [ "$capsmode" = "1" ]; then
 -    CAPS_INIT_DROP=$(getarg rd.caps.initdrop=)
--    CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b ; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
+-    CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b  || [ -n "$a" ]; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
 -    CAPS_MODULES_DISABLED=$(getarg rd.caps.disablemodules=)
 -    CAPS_KEXEC_DISABLED=$(getarg rd.caps.disablekexec=)
 -
@@ -94,32 +123,3 @@ Index: dracut-041/modules.d/02caps/caps.sh
 -    info "Will drop capabilities $CAPS_INIT_DROP from init."
 -fi
 -
-Index: dracut-041/modules.d/02caps/module-setup.sh
-===================================================================
---- dracut-041.orig/modules.d/02caps/module-setup.sh	2015-03-17 13:30:53.238200386 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,24 +0,0 @@
--#!/bin/bash
--
--# called by dracut
--check() {
--    require_binaries capsh
--}
--
--# called by dracut
--depends() {
--    return 0
--}
--
--# called by dracut
--install() {
--    if ! dracut_module_included "systemd"; then
--        inst_hook pre-pivot 00 "$moddir/caps.sh"
--        inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
--        # capsh wants bash and we need bash also
--        inst /bin/bash
--    else
--        dwarning "caps: does not work with systemd in the initramfs"
--    fi
--}
--

0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch

@@ -12,10 +12,10 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  modules.d/97biosdevname/module-setup.sh | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/97biosdevname/module-setup.sh
+Index: dracut-042/modules.d/97biosdevname/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/97biosdevname/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/97biosdevname/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/97biosdevname/module-setup.sh	2015-03-24 15:15:31.680906812 +0100
++++ dracut-042/modules.d/97biosdevname/module-setup.sh	2015-06-24 18:02:13.557610904 +0200
 @@ -3,7 +3,8 @@
  # called by dracut
  check() {

0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch

@@ -15,11 +15,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/parse-ip-opts.sh |  8 +++++++-
  3 files changed, 24 insertions(+), 2 deletions(-)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-17 17:19:54.375944711 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:12.961576972 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-17 17:24:27.803263036 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:13.849627528 +0200
-@@ -399,6 +399,18 @@
+@@ -399,6 +399,18 @@ for p in $(getargs ip=); do
      [ "$use_bridge" != 'true' ] && \
      [ "$use_vlan" != 'true' ] && continue
  
@@ -38,7 +38,7 @@ Index: dracut-041/modules.d/40network/ifup.sh
      # setup nameserver
      namesrv="$dns1 $dns2 $(getargs nameserver)"
      for s in $namesrv; do
-@@ -412,7 +424,7 @@
+@@ -412,7 +424,7 @@ for p in $(getargs ip=); do
  
      for autoopt in $(str_replace "$autoconf" "," " "); do
          case $autoopt in
@@ -47,11 +47,11 @@ Index: dracut-041/modules.d/40network/ifup.sh
                  do_dhcp -4 ;;
              dhcp6)
                  load_ipv6
-Index: dracut-041/modules.d/40network/module-setup.sh
+Index: dracut-042/modules.d/40network/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/module-setup.sh	2015-03-17 17:19:54.383945160 +0100
+--- dracut-042.orig/modules.d/40network/module-setup.sh	2015-06-24 18:02:05.949177762 +0200
-+++ dracut-041/modules.d/40network/module-setup.sh	2015-03-17 17:24:05.189997137 +0100
++++ dracut-042/modules.d/40network/module-setup.sh	2015-06-24 18:02:13.849627528 +0200
-@@ -99,6 +99,10 @@
+@@ -51,6 +51,10 @@ install() {
  
      _arch=$(uname -m)
  
@@ -62,11 +62,11 @@ Index: dracut-041/modules.d/40network/module-setup.sh
      inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
          {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
  
-Index: dracut-041/modules.d/40network/parse-ip-opts.sh
+Index: dracut-042/modules.d/40network/parse-ip-opts.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/parse-ip-opts.sh	2015-03-17 17:24:05.193997361 +0100
+--- dracut-042.orig/modules.d/40network/parse-ip-opts.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/parse-ip-opts.sh	2015-03-17 17:26:56.711605514 +0100
++++ dracut-042/modules.d/40network/parse-ip-opts.sh	2015-06-24 18:02:13.849627528 +0200
-@@ -67,7 +67,13 @@
+@@ -67,7 +67,13 @@ for p in $(getargs ip=); do
      for autoopt in $(str_replace "$autoconf" "," " "); do
          case $autoopt in
              error) die "Error parsing option 'ip=$p'";;

0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch

@@ -1,158 +0,0 @@
-From 6cadece6089ef4d4efbfebeb6b23ca3f2429b36c Mon Sep 17 00:00:00 2001
-From: Thomas Renninger <trenn@suse.de>
-Date: Tue, 8 Jul 2014 17:34:08 +0200
-Subject: dracut: Enable converting of directory /var/run /var/lock to symlinks
- to /run
-
-If /var/run is a directory this module will be added.
-After reboot /var/run and /var/lock will be symlinks.
-Another initrd re-creation will not include convertfs module anymore.
-
-bnc#877680
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
----
- modules.d/30convertfs/convertfs.sh    |  9 ------
- modules.d/30convertfs/convertrunfs.sh | 54 +++++++++++++++++++++++++++++++++++
- modules.d/30convertfs/do-convertfs.sh | 17 +++++++++++
- modules.d/30convertfs/module-setup.sh | 10 +++++--
- 4 files changed, 79 insertions(+), 11 deletions(-)
- create mode 100755 modules.d/30convertfs/convertrunfs.sh
-
-Index: dracut-041/modules.d/30convertfs/convertfs.sh
-===================================================================
---- dracut-041.orig/modules.d/30convertfs/convertfs.sh	2015-01-31 12:54:52.000000000 +0100
-+++ dracut-041/modules.d/30convertfs/convertfs.sh	2015-03-17 17:37:15.774237322 +0100
-@@ -62,15 +62,6 @@
- fi
- rm -f -- "$testfile"
- 
--testfile="$ROOT/usr/.usrmovecheck$$"
--rm -f -- "$testfile"
--> "$testfile"
--if [[ ! -e "$testfile" ]]; then
--    echo "Cannot write to $ROOT/usr/"
--    exit 1
--fi
--rm -f -- "$testfile"
--
- find_mount() {
-     local dev mnt etc wanted_dev
-     wanted_dev="$(readlink -e -q $1)"
-Index: dracut-041/modules.d/30convertfs/convertrunfs.sh
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-041/modules.d/30convertfs/convertrunfs.sh	2015-03-17 17:37:15.778237383 +0100
-@@ -0,0 +1,54 @@
-+#!/bin/bash
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+
-+ROOT="$1"
-+
-+if [[ ! -d "$ROOT" ]]; then
-+    echo "Usage: $0 <rootdir>"
-+    exit 1
-+fi
-+
-+if [[ "$ROOT" -ef / ]]; then
-+    echo "Can't convert the running system."
-+    echo "Please boot with 'rd.convertfs' on the kernel command line,"
-+    echo "to update with the help of the initramfs,"
-+    echo "or run this script from a rescue system."
-+    exit 1
-+fi
-+
-+while [[ "$ROOT" != "${ROOT%/}" ]]; do
-+    ROOT=${ROOT%/}
-+done
-+
-+if findmnt "$ROOT" -O ro;then
-+    WAS_RO=1
-+    mount $ROOT -o remount,rw
-+else
-+    WAS_RO=0
-+fi
-+
-+testfile="$ROOT/.usrmovecheck$$"
-+rm -f -- "$testfile"
-+> "$testfile"
-+if [[ ! -e "$testfile" ]]; then
-+    echo "Cannot write to $ROOT/"
-+    exit 1
-+fi
-+rm -f -- "$testfile"
-+
-+if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
-+    echo "Converting /var/run to symlink"
-+    mv -f $ROOT/var/run $ROOT/var/run.runmove~
-+    ln -sfn ../run $ROOT/var/run
-+fi
-+
-+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
-+    echo "Converting /var/lock to symlink"
-+    mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
-+    ln -sfn ../run/lock $ROOT/var/lock
-+fi
-+
-+if [ $WAS_RO -eq 1 ];then
-+    mount $ROOT -o remount,ro
-+fi
-Index: dracut-041/modules.d/30convertfs/do-convertfs.sh
-===================================================================
---- dracut-041.orig/modules.d/30convertfs/do-convertfs.sh	2015-03-17 17:31:01.441312547 +0100
-+++ dracut-041/modules.d/30convertfs/do-convertfs.sh	2015-03-17 17:37:15.786237620 +0100
-@@ -1,9 +1,26 @@
- #!/bin/bash
- 
-+# This converts all, /usr/bin -> /bin, ... and /var/run -> /run
-+# Do not enable by default!
- if getargbool 0 rd.convertfs; then
-+    info "Converting both /var/run to /run tmpfs and /usr/bin -> /bin"
-     if getargbool 0 rd.debug; then
-         bash -x convertfs "$NEWROOT" 2>&1 | vinfo
-+        exit 0
-     else
-         convertfs "$NEWROOT" 2>&1 | vinfo
-+        exit 0
-+    fi
-+fi
-+
-+# This only converts /var/run -> /run as tmpfs
-+if ! test -L "$NEWROOT"/var/run;then
-+    info "Converting /var/run to /run tmpfs"
-+    if getargbool 0 rd.debug; then
-+        bash -x convertrunfs "$NEWROOT" 2>&1 | vinfo
-+        exit 0
-+    else
-+        convertrunfs "$NEWROOT" 2>&1 | vinfo
-+        exit 0
-     fi
- fi
-Index: dracut-041/modules.d/30convertfs/module-setup.sh
-===================================================================
---- dracut-041.orig/modules.d/30convertfs/module-setup.sh	2015-03-17 17:31:01.445312770 +0100
-+++ dracut-041/modules.d/30convertfs/module-setup.sh	2015-03-17 17:37:15.786237620 +0100
-@@ -2,8 +2,13 @@
- 
- # called by dracut
- check() {
--    [[ $mount_needs ]] && return 1
--    return 255
-+    # Only check for /var/run
-+    if test -L /var/run;then
-+        return 255
-+    else
-+        require_binaries bash find ldconfig mv rm cp ln || return 1
-+        return 0
-+    fi
- }
- 
- # called by dracut
-@@ -16,5 +21,6 @@
-     inst_multiple bash find ldconfig mv rm cp ln
-     inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"
-     inst_script "$moddir/convertfs.sh" /usr/bin/convertfs
-+    inst_script "$moddir/convertrunfs.sh" /usr/bin/convertrunfs
- }
- 

0107-Fixup-typo-firmare-instead-of-firmware.patch

@@ -9,11 +9,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/parse-zfcp.sh | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:19.484221789 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:12.329540991 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:36.577181837 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:14.541666926 +0200
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ EOF
  }
  
  if [[ -f /sys/firmware/ipl/ipl_type &&
@@ -22,11 +22,11 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
      (
          local _ccw=$(cat /sys/firmware/ipl/device)
  
-Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
+Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-24 15:15:16.804071255 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:12.041524595 +0200
-+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-24 15:15:36.577181837 +0100
++++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:14.541666926 +0200
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ EOF
  }
  
  if [[ -f /sys/firmware/ipl/ipl_type &&

0108-91zipl-Store-commandline-correctly.patch

@@ -11,10 +11,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/91zipl/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
+Index: dracut-042/modules.d/91zipl/module-setup.sh
-index a8d95c5..84bb41d 100644
+===================================================================
---- a/modules.d/91zipl/module-setup.sh
+--- dracut-042.orig/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:12.621557615 +0200
-+++ b/modules.d/91zipl/module-setup.sh
++++ dracut-042/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:14.857684916 +0200
 @@ -39,7 +39,7 @@ install() {
      if [[ $hostonly_cmdline == "yes" ]] ; then
          local _zipl=$(cmdline)
@@ -24,6 +24,3 @@ index a8d95c5..84bb41d 100644
      fi
      dracut_need_initqueue
  }
--- 
-1.8.4.5
-

0109-95dasd_rules-Store-all-devices-in-commandline.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/module-setup.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: dracut-041/modules.d/95dasd_rules/module-setup.sh
+Index: dracut-042/modules.d/95dasd_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh	2015-03-24 15:14:26.249231803 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/module-setup.sh	2015-06-24 18:02:10.881458552 +0200
-+++ dracut-041/modules.d/95dasd_rules/module-setup.sh	2015-03-24 15:15:39.977372818 +0100
++++ dracut-042/modules.d/95dasd_rules/module-setup.sh	2015-06-24 18:02:15.149701540 +0200
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,8 @@ cmdline() {
          return 0
      }
      [[ $hostonly ]] || [[ $mount_needs ]] && {

0110-95zfcp_rules-Store-all-devices-in-commandline.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/module-setup.sh | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
+Index: dracut-042/modules.d/95zfcp_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh	2015-03-24 15:15:15.552000930 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:11.753508198 +0200
-+++ dracut-041/modules.d/95zfcp_rules/module-setup.sh	2015-03-24 15:15:43.249556607 +0100
++++ dracut-042/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:15.445718391 +0200
-@@ -14,11 +14,11 @@
+@@ -14,11 +14,11 @@ cmdline() {
          _wwpn=$(cat ${_sdev}/wwpn)
          _ccw=$(cat ${_sdev}/hba_id)
          echo "rd.zfcp=${_ccw},${_wwpn},${_lun}"
@@ -32,7 +32,7 @@ Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
  }
  
  # called by dracut
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ check() {
      require_binaries /usr/lib/udev/collect || return 1
  
      [[ $hostonly ]] || [[ $mount_needs ]] && {

0113-91zipl-Install-script-as-executable.patch

@@ -14,12 +14,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  3 files changed, 3 insertions(+), 3 deletions(-)
  mode change 100644 => 100755 modules.d/91zipl/install_zipl_cmdline.sh
 
-diff --git a/modules.d/91zipl/install_zipl_cmdline.sh b/modules.d/91zipl/install_zipl_cmdline.sh
+Index: dracut-042/modules.d/91zipl/install_zipl_cmdline.sh
-old mode 100644
+===================================================================
-new mode 100755
+--- dracut-042.orig/modules.d/91zipl/install_zipl_cmdline.sh	2015-06-24 18:02:12.621557615 +0200
-index 8b454b8..3e939c1
++++ dracut-042/modules.d/91zipl/install_zipl_cmdline.sh	2015-06-24 18:02:15.773737066 +0200
---- a/modules.d/91zipl/install_zipl_cmdline.sh
-+++ b/modules.d/91zipl/install_zipl_cmdline.sh
 @@ -1,6 +1,6 @@
  #!/bin/bash
  
@@ -28,10 +26,10 @@ index 8b454b8..3e939c1
  MNT=/boot/zipl
  
  if [ -z "$DEV" ] ; then
-diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
+Index: dracut-042/modules.d/91zipl/module-setup.sh
-index 84bb41d..eda4c32 100644
+===================================================================
---- a/modules.d/91zipl/module-setup.sh
+--- dracut-042.orig/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:14.857684916 +0200
-+++ b/modules.d/91zipl/module-setup.sh
++++ dracut-042/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:15.773737066 +0200
 @@ -35,7 +35,7 @@ install() {
      inst_multiple mount umount
  
@@ -41,10 +39,10 @@ index 84bb41d..eda4c32 100644
      if [[ $hostonly_cmdline == "yes" ]] ; then
          local _zipl=$(cmdline)
  
-diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh
+Index: dracut-042/modules.d/91zipl/parse-zipl.sh
-index f8c2ca4..308f228 100644
+===================================================================
---- a/modules.d/91zipl/parse-zipl.sh
+--- dracut-042.orig/modules.d/91zipl/parse-zipl.sh	2015-06-24 18:02:12.621557615 +0200
-+++ b/modules.d/91zipl/parse-zipl.sh
++++ dracut-042/modules.d/91zipl/parse-zipl.sh	2015-06-24 18:02:15.773737066 +0200
 @@ -31,7 +31,7 @@ if [ -n "$zipl_arg" ] ; then
      esac
      if [ "$zipl_env" ] ; then
@@ -54,6 +52,3 @@ index f8c2ca4..308f228 100644
                  ${zipl_env} ${zipl_val} ${zipl_arg}
              echo "[ -f /tmp/install.zipl.cmdline-done ]" >$hookdir/initqueue/finished/wait-zipl-conf.sh
          } >> /etc/udev/rules.d/99zipl-conf.rules
--- 
-1.8.4.5
-

0114-91zipl-Translate-ext2-3-into-ext4.patch

@@ -14,10 +14,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/91zipl/module-setup.sh | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
-diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
+Index: dracut-042/modules.d/91zipl/module-setup.sh
-index eda4c32..9fe6acc 100644
+===================================================================
---- a/modules.d/91zipl/module-setup.sh
+--- dracut-042.orig/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:15.773737066 +0200
-+++ b/modules.d/91zipl/module-setup.sh
++++ dracut-042/modules.d/91zipl/module-setup.sh	2015-06-24 18:02:16.101755740 +0200
 @@ -17,7 +17,20 @@ depends() {
  
  # called by dracut
@@ -40,6 +40,3 @@ index eda4c32..9fe6acc 100644
  }
  
  # called by dracut
--- 
-1.8.4.5
-

0117-95dasd_rules-Enable-the-device-before-checking-devic.patch

@@ -12,11 +12,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95dasd_rules/parse-dasd.sh | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
+Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
 ===================================================================
---- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:36.577181837 +0100
+--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:14.541666926 +0200
-+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh	2015-03-24 15:15:50.865984400 +0100
++++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh	2015-06-24 18:02:16.761793314 +0200
-@@ -5,6 +5,10 @@
+@@ -5,6 +5,10 @@ create_udev_rule() {
      local _drv _cu_type _dev_type
      local _rule=/etc/udev/rules.d/51-dasd-${ccw}.rules
  
@@ -27,7 +27,7 @@ Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
      if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
          read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
          read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype
-@@ -29,10 +33,6 @@
+@@ -29,10 +33,6 @@ create_udev_rule() {
      esac
      [ -z "${_drv}" ] && return 0
  

0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch

@@ -12,11 +12,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/parse-zfcp.sh | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
+Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 17:40:04.923688032 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:14.541666926 +0200
-+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh	2015-03-17 17:40:05.135699878 +0100
++++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh	2015-06-24 18:02:17.057810167 +0200
-@@ -7,6 +7,10 @@
+@@ -7,6 +7,10 @@ create_udev_rule() {
      local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
      local _cu_type _dev_type
  
@@ -27,7 +27,7 @@ Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
      if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
          read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
          read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype
-@@ -18,10 +22,6 @@
+@@ -18,10 +22,6 @@ create_udev_rule() {
          return 0;
      fi
  

0119-Reset-IFS-variable.patch

@@ -14,11 +14,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp/parse-zfcp.sh | 2 ++
  3 files changed, 6 insertions(+)
 
-Index: dracut-041/modules.d/95fcoe/parse-fcoe.sh
+Index: dracut-042/modules.d/95fcoe/parse-fcoe.sh
 ===================================================================
---- dracut-041.orig/modules.d/95fcoe/parse-fcoe.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/95fcoe/parse-fcoe.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95fcoe/parse-fcoe.sh	2015-03-24 15:15:55.474243227 +0100
++++ dracut-042/modules.d/95fcoe/parse-fcoe.sh	2015-06-24 18:02:21.326053152 +0200
-@@ -26,8 +26,10 @@
+@@ -26,8 +26,10 @@ initqueue --onetime modprobe -b -q bnx2f
  udevadm settle --timeout=30
  
  parse_fcoe_opts() {

0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch

@@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  mkinitrd-suse.sh | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
 
-Index: dracut-041/mkinitrd-suse.sh
+Index: dracut-042/mkinitrd-suse.sh
 ===================================================================
---- dracut-041.orig/mkinitrd-suse.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/mkinitrd-suse.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/mkinitrd-suse.sh	2015-03-17 17:42:12.198799273 +0100
++++ dracut-042/mkinitrd-suse.sh	2015-06-24 18:02:21.618069777 +0200
-@@ -280,7 +280,8 @@
+@@ -280,7 +280,8 @@ done
  
  [[ $targets && $kernels ]] || default_kernel_images
  if [[ ! $targets || ! $kernels ]];then
@@ -24,7 +24,7 @@ Index: dracut-041/mkinitrd-suse.sh
  fi
  
  # We can have several targets/kernels, transform the list to an array
-@@ -301,6 +302,8 @@
+@@ -301,6 +302,8 @@ fi
  [[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}"
  shopt -s extglob
  
@@ -33,7 +33,7 @@ Index: dracut-041/mkinitrd-suse.sh
  for ((i=0 ; $i<${#targets[@]} ; i++)); do
  
      if [[ $img_vers ]];then
-@@ -329,14 +332,18 @@
+@@ -329,14 +332,18 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d
          # expansion magics
          if [ -n "${modules_all}" ];then
              $dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel" &>/dev/null
@@ -52,7 +52,7 @@ Index: dracut-041/mkinitrd-suse.sh
          fi
      fi
  done
-@@ -345,4 +352,12 @@
+@@ -345,4 +352,12 @@ if [ "$skip_update_bootloader" ] ; then
      echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually."
  else
      update-bootloader --refresh

0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch

@@ -13,11 +13,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  lsinitrd.sh | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: dracut-041/dracut.sh
+Index: dracut-042/dracut.sh
 ===================================================================
---- dracut-041.orig/dracut.sh	2015-03-24 15:12:43.427456873 +0100
+--- dracut-042.orig/dracut.sh	2015-06-24 18:02:08.745336946 +0200
-+++ dracut-041/dracut.sh	2015-03-24 15:16:01.578586094 +0100
++++ dracut-042/dracut.sh	2015-06-24 18:02:21.906086174 +0200
-@@ -646,7 +646,7 @@
+@@ -658,7 +658,7 @@ if ! [[ $outfile ]]; then
      if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
          outfile="/boot/${MACHINE_ID}/$kernel/initrd"
      else
@@ -26,11 +26,11 @@ Index: dracut-041/dracut.sh
      fi
  fi
  
-Index: dracut-041/lsinitrd.sh
+Index: dracut-042/lsinitrd.sh
 ===================================================================
---- dracut-041.orig/lsinitrd.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/lsinitrd.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/lsinitrd.sh	2015-03-24 15:16:01.578586094 +0100
++++ dracut-042/lsinitrd.sh	2015-06-24 18:02:21.906086174 +0200
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ else
          && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
          image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
      else

0122-Get_kernel_version_from_gz_file_for_arm.patch

@@ -0,0 +1,48 @@
+Index: dracut-042/mkinitrd-suse.sh
+===================================================================
+--- dracut-042.orig/mkinitrd-suse.sh	2015-06-24 18:02:21.618069777 +0200
++++ dracut-042/mkinitrd-suse.sh	2015-06-24 18:02:22.218103937 +0200
+@@ -145,6 +145,33 @@ is_xen_kernel() {
+     return
+ }
+ 
++# kernel_image_gz_from_image() and kernel_version_from_image() are helpers
++# for arm* kernels which produce zImage files which cannot be read from
++# get_kernel_version -> get rid of this workaround if possible
++kernel_image_gz_from_image() {
++    local arch=$(uname -i)
++    local r=${1}.gz
++
++    # uImage kernels can't be extracted directly. Use the vmlinux.gz instead
++    r=${r//uImage/vmlinux}
++
++    # on ARM a zImage can't be extracted directly. Other platforms define it
++    # as a gzipped vmlinux file, but not ARM. So only on ARM, use vmlinux.gz.
++    if [[ $arch =~ arm ]] || [[ $arch =~ aarch ]]; then
++        r=${r//zImage/vmlinux}
++    fi
++
++    echo $r
++}
++
++kernel_version_from_image() {
++    local kernel_image="$1" kernel_image_gz=$(kernel_image_gz_from_image "$1")
++
++    if get_kernel_version "$kernel_image" 2>/dev/null; then
++        return
++    fi
++    get_kernel_version "$kernel_image_gz" 2>/dev/null
++}
+ 
+ # Taken over from SUSE mkinitrd
+ default_kernel_images() {
+@@ -183,7 +210,8 @@ default_kernel_images() {
+ 
+         [ -L "$boot_dir/$kernel_image" ] && continue
+         [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
+-        kernel_version=$(/usr/bin/get_kernel_version \
++
++        kernel_version=$(kernel_version_from_image \
+                          $boot_dir/$kernel_image 2> /dev/null)
+         initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
+         if [ "$kernel_image" != "$initrd_image" -a \

0123-95zfcp_rules-fix-typo-in-module_setup.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/95zfcp_rules/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh
+Index: dracut-042/modules.d/95zfcp_rules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh	2015-03-24 15:15:43.249556607 +0100
+--- dracut-042.orig/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:15.445718391 +0200
-+++ dracut-041/modules.d/95zfcp_rules/module-setup.sh	2015-03-24 15:16:04.250736181 +0100
++++ dracut-042/modules.d/95zfcp_rules/module-setup.sh	2015-06-24 18:02:22.510120561 +0200
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ install() {
          local _zfcp
  
          for _zfcp in $(cmdline) ; do

0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch

@@ -13,11 +13,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/net-lib.sh | 48 +++++++++++++++++++++++++++++++++++++-----
  1 file changed, 43 insertions(+), 5 deletions(-)
 
-Index: dracut-041/modules.d/40network/net-lib.sh
+Index: dracut-042/modules.d/40network/net-lib.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/net-lib.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/40network/net-lib.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/net-lib.sh	2015-03-24 15:16:07.018891661 +0100
++++ dracut-042/modules.d/40network/net-lib.sh	2015-06-24 18:02:22.802137185 +0200
-@@ -213,20 +213,51 @@
+@@ -213,20 +213,51 @@ ibft_to_cmdline() {
  
              [ -e /tmp/net.${dev}.has_ibft_config ] && continue
  
@@ -73,7 +73,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
                      echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
                  else
                      warn "${iface} does not contain a valid iBFT configuration"
-@@ -405,6 +436,13 @@
+@@ -405,6 +436,13 @@ ip_to_var() {
              esac
              ;;
      esac

0125-40network-separate-mask-and-prefix.patch

@@ -18,11 +18,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/parse-ip-opts.sh |  2 +-
  3 files changed, 45 insertions(+), 8 deletions(-)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-18 11:57:28.788553583 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:13.849627528 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-18 11:57:31.032679982 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:23.090153581 +0200
-@@ -222,13 +222,14 @@
+@@ -222,13 +222,14 @@ do_static() {
      linkup $netif
      [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
      [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
@@ -39,7 +39,7 @@ Index: dracut-041/modules.d/40network/ifup.sh
      fi
  
      [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
-@@ -404,7 +405,7 @@
+@@ -404,7 +405,7 @@ for p in $(getargs ip=); do
          # Pull in existing static configuration
          . /etc/sysconfig/network/ifcfg-${netif}
          ip=${IPADDR}
@@ -48,7 +48,7 @@ Index: dracut-041/modules.d/40network/ifup.sh
          mtu=${MTU}
          server=${REMOTE_IPADDR}
          gw=${GATEWAY}
-@@ -418,7 +419,7 @@
+@@ -418,7 +419,7 @@ for p in $(getargs ip=); do
      done
  
      # Store config for later use
@@ -57,11 +57,11 @@ Index: dracut-041/modules.d/40network/ifup.sh
          eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
      done > /tmp/net.$netif.override
  
-Index: dracut-041/modules.d/40network/net-lib.sh
+Index: dracut-042/modules.d/40network/net-lib.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/net-lib.sh	2015-03-18 11:57:28.792553808 +0100
+--- dracut-042.orig/modules.d/40network/net-lib.sh	2015-06-24 18:02:22.802137185 +0200
-+++ dracut-041/modules.d/40network/net-lib.sh	2015-03-18 11:57:31.036680206 +0100
++++ dracut-042/modules.d/40network/net-lib.sh	2015-06-24 18:02:23.090153581 +0200
-@@ -7,6 +7,35 @@
+@@ -7,6 +7,35 @@ get_ip() {
      ip=${ip##* }
  }
  
@@ -97,7 +97,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
  iface_for_remote_addr() {
      set -- $(ip -o route get to $1)
      echo $5
-@@ -204,7 +233,7 @@
+@@ -204,7 +233,7 @@ ibft_to_cmdline() {
          for iface in /sys/firmware/ibft/ethernet*; do
              local mac="" dev=""
              local dhcp="" ip="" gw="" mask="" hostname=""
@@ -106,7 +106,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
  
              [ -e ${iface}/mac ] || continue
              mac=$(read a < ${iface}/mac; echo $a)
-@@ -249,6 +278,7 @@
+@@ -249,6 +278,7 @@ ibft_to_cmdline() {
                  [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
                  if [ "$family" = "ipv6" ] ; then
                      if [ -n "$ip" ] ; then
@@ -114,7 +114,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
                          [ -n "$prefix" ] || prefix=64
                          ip="[${ip}/${prefix}]"
                          mask=
-@@ -256,6 +286,11 @@
+@@ -256,6 +286,11 @@ ibft_to_cmdline() {
                      if [ -n "$gw" ] ; then
                          gw="[${gw}]"
                      fi
@@ -126,7 +126,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
                  fi
                  if [ -n "$ip" ] && [ -n "$mask" -o -n "$prefix" ]; then
                      echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
-@@ -264,6 +299,7 @@
+@@ -264,6 +299,7 @@ ibft_to_cmdline() {
                      warn "ip-addr=$ip"
                      warn "gateway=$gw"
                      warn "subnet-mask=$mask"
@@ -134,7 +134,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
                      warn "hostname=$hostname"
                  fi
              else
-@@ -411,7 +447,7 @@
+@@ -411,7 +447,7 @@ ip_to_var() {
          fi
      done
  
@@ -143,7 +143,7 @@ Index: dracut-041/modules.d/40network/net-lib.sh
      case $# in
          0)  autoconf="error" ;;
          1)  autoconf=$1 ;;
-@@ -439,7 +475,7 @@
+@@ -439,7 +475,7 @@ ip_to_var() {
      # Extract prefix length from CIDR notation
      case $ip in
          */*)
@@ -152,11 +152,11 @@ Index: dracut-041/modules.d/40network/net-lib.sh
              ip=${ip%/*}
              ;;
      esac
-Index: dracut-041/modules.d/40network/parse-ip-opts.sh
+Index: dracut-042/modules.d/40network/parse-ip-opts.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/parse-ip-opts.sh	2015-03-18 11:57:31.044680739 +0100
+--- dracut-042.orig/modules.d/40network/parse-ip-opts.sh	2015-06-24 18:02:13.849627528 +0200
-+++ dracut-041/modules.d/40network/parse-ip-opts.sh	2015-03-18 11:58:13.727085881 +0100
++++ dracut-042/modules.d/40network/parse-ip-opts.sh	2015-06-24 18:02:23.090153581 +0200
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ for p in $(getargs ip=); do
              none|off)
                  [ -z "$ip" ] && \
                      die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense"

0126-01fips-Add-drbg-module-to-force-loaded-modules.patch

@@ -10,16 +10,16 @@ Signed-off-by: Marcus Meissner <meissner@suse.de>
  modules.d/01fips/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/01fips/module-setup.sh
+Index: dracut-042/modules.d/01fips/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/module-setup.sh	2015-03-24 15:10:53.469281351 +0100
+--- dracut-042.orig/modules.d/01fips/module-setup.sh	2015-06-24 18:02:08.453320321 +0200
-+++ dracut-041/modules.d/01fips/module-setup.sh	2015-03-24 15:16:11.787159483 +0100
++++ dracut-042/modules.d/01fips/module-setup.sh	2015-06-24 18:02:23.422172483 +0200
-@@ -21,7 +21,7 @@
+@@ -22,6 +22,8 @@ installkernel() {
      _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "                      
      _fipsmodules+="ghash-clmulni-intel "                                       
  
--    # once it is in the kernel: _fipsmodules+="drbg "
++    _fipsmodules+="drbg"
-+    _fipsmodules+="drbg "
++
- 
      mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
  
+     for _mod in $_fipsmodules; do

0130-nfs-Always-add-all-kernel-modules-for-kdump.patch

@@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  modules.d/95nfs/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/95nfs/module-setup.sh
+Index: dracut-042/modules.d/95nfs/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/95nfs/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/95nfs/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/95nfs/module-setup.sh	2015-03-18 11:58:44.924843754 +0100
++++ dracut-042/modules.d/95nfs/module-setup.sh	2015-06-24 18:02:23.718189334 +0200
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ depends() {
  
  # called by dracut
  installkernel() {

0131-40network-handle-prefixed-IP-addresses-correctly.patch

@@ -14,11 +14,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/ifup.sh | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-24 15:16:09.539033210 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:23.090153581 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-24 15:16:16.595429551 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:27.658413647 +0200
-@@ -223,11 +223,19 @@
+@@ -223,11 +223,19 @@ do_static() {
      [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
      [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
      [ -n "$mask" -a -z "$prefix" ] && prefix=$(mask_to_prefix $mask)

0132-40network-fixup-static-network-configuration.patch

@@ -18,11 +18,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/net-lib.sh      |  6 +++++-
  3 files changed, 20 insertions(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/40network/ifup.sh
+Index: dracut-042/modules.d/40network/ifup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/ifup.sh	2015-03-18 12:03:26.848727065 +0100
+--- dracut-042.orig/modules.d/40network/ifup.sh	2015-06-24 18:02:27.658413647 +0200
-+++ dracut-041/modules.d/40network/ifup.sh	2015-03-18 12:04:02.246720640 +0100
++++ dracut-042/modules.d/40network/ifup.sh	2015-06-24 18:02:27.950430272 +0200
-@@ -241,6 +241,19 @@
+@@ -241,6 +241,19 @@ do_static() {
      fi
  
      [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
@@ -42,11 +42,11 @@ Index: dracut-041/modules.d/40network/ifup.sh
      [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
  
      return 0
-Index: dracut-041/modules.d/40network/module-setup.sh
+Index: dracut-042/modules.d/40network/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/module-setup.sh	2015-03-18 12:03:21.864446201 +0100
+--- dracut-042.orig/modules.d/40network/module-setup.sh	2015-06-24 18:02:13.849627528 +0200
-+++ dracut-041/modules.d/40network/module-setup.sh	2015-03-18 12:03:26.856727409 +0100
++++ dracut-042/modules.d/40network/module-setup.sh	2015-06-24 18:02:27.950430272 +0200
-@@ -101,6 +101,8 @@
+@@ -53,6 +53,8 @@ install() {
  
      [[ $hostonly ]] && {
          inst_multiple /etc/sysconfig/network/ifcfg-*
@@ -55,27 +55,3 @@ Index: dracut-041/modules.d/40network/module-setup.sh
      }
  
      inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
-Index: dracut-041/modules.d/40network/net-lib.sh
-===================================================================
---- dracut-041.orig/modules.d/40network/net-lib.sh	2015-03-18 12:03:21.872446652 +0100
-+++ dracut-041/modules.d/40network/net-lib.sh	2015-03-18 12:03:26.860727590 +0100
-@@ -123,7 +123,6 @@
-     [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
-     [ -z "$IFACES" ] && IFACES="$netif"
-     # run the scripts written by ifup
--    [ -e /tmp/net.$netif.gw ]            && . /tmp/net.$netif.gw
-     [ -e /tmp/net.$netif.hostname ]      && . /tmp/net.$netif.hostname
-     [ -e /tmp/net.$netif.override ]      && . /tmp/net.$netif.override
-     [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
-@@ -150,6 +149,11 @@
-     # Note: This assumes that if no router is present the
-     # root server is on the same subnet.
- 
-+    if [ -e /tmp/net.$netif.gw ] ; then
-+        while read line ; do
-+            eval $line
-+        done < /tmp/net.$netif.gw
-+    fi
-     # Get DHCP-provided router IP, or the cmdline-provided "gw=" argument
-     [ -n "$new_routers" ] && gw_ip=${new_routers%%,*}
-     [ -n "$gw" ] && gw_ip=$gw

0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch

@@ -10,22 +10,22 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  modules.d/01fips/module-setup.sh |   13 +++++++------
  2 files changed, 9 insertions(+), 10 deletions(-)
 
-Index: dracut-041/modules.d/01fips/fips.sh
+Index: dracut-042/modules.d/01fips/fips.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/fips.sh	2015-03-18 13:56:05.453753422 +0100
+--- dracut-042.orig/modules.d/01fips/fips.sh	2015-06-24 18:02:07.817284113 +0200
-+++ dracut-041/modules.d/01fips/fips.sh	2015-03-18 13:59:59.386939913 +0100
++++ dracut-042/modules.d/01fips/fips.sh	2015-06-24 18:02:28.266448262 +0200
-@@ -59,9 +59,7 @@
+@@ -59,9 +59,7 @@ do_rhevh_check()
      kpath=${1}
  
      # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0
--    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done)
+-    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b || [ -n "$a" ]; do printf "%s\n" $a; done)
--    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b; do printf "%s\n" $a; done || return 1)
+-    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b || [ -n "$a" ]; do printf "%s\n" $a; done || return 1)
 -    if [ -z "$HMAC_SUM_ORIG" ] || [ -z "$HMAC_SUM_CALC" ] || [ "${HMAC_SUM_ORIG}" != "${HMAC_SUM_CALC}" ]; then
 +    if fipscheck $NEWROOT/boot/vmlinuz-${KERNEL} ; then
          warn "HMAC sum mismatch"
          return 1
      fi
-@@ -126,7 +124,7 @@
+@@ -126,7 +124,7 @@ do_fips()
      elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then
          do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
      else
@@ -34,20 +34,11 @@ Index: dracut-041/modules.d/01fips/fips.sh
      fi
  
      info "All initrd crypto checks done"
-Index: dracut-041/modules.d/01fips/module-setup.sh
+Index: dracut-042/modules.d/01fips/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/01fips/module-setup.sh	2015-03-18 13:56:05.457753647 +0100
+--- dracut-042.orig/modules.d/01fips/module-setup.sh	2015-06-24 18:02:23.422172483 +0200
-+++ dracut-041/modules.d/01fips/module-setup.sh	2015-03-18 14:10:06.717187740 +0100
++++ dracut-042/modules.d/01fips/module-setup.sh	2015-06-24 18:02:28.266448262 +0200
-@@ -21,7 +21,7 @@
+@@ -41,15 +41,16 @@ install() {
-     _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
-     _fipsmodules+="ghash-clmulni-intel "
- 
--    _fipsmodules+="drbg "
-+    _fipsmodules+="drbg"
- 
-     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
- 
-@@ -40,15 +40,16 @@
      inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
      inst_script "$moddir/fips.sh" /sbin/fips.sh
  

0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch

@@ -9,11 +9,11 @@ Signed-off-by: Julian Wolf <juwolf@suse.de>
  modules.d/40network/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/modules.d/40network/module-setup.sh
+Index: dracut-042/modules.d/40network/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/module-setup.sh	2015-03-24 15:16:22.251747251 +0100
+--- dracut-042.orig/modules.d/40network/module-setup.sh	2015-06-24 18:02:27.950430272 +0200
-+++ dracut-041/modules.d/40network/module-setup.sh	2015-03-24 15:17:03.618071127 +0100
++++ dracut-042/modules.d/40network/module-setup.sh	2015-06-24 18:02:28.582466253 +0200
-@@ -101,7 +101,7 @@
+@@ -53,7 +53,7 @@ install() {
  
      [[ $hostonly ]] && {
          inst_multiple /etc/sysconfig/network/ifcfg-*

0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch

@@ -17,18 +17,18 @@ Signed-off-by: Julian Wolf <juwolf@suse.de>
  modules.d/90crypt/module-setup.sh | 4 ++++
  2 files changed, 13 insertions(+)
 
-Index: dracut-041/modules.d/90crypt/crypt-lib.sh
+Index: dracut-042/modules.d/90crypt/crypt-lib.sh
 ===================================================================
---- dracut-041.orig/modules.d/90crypt/crypt-lib.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/90crypt/crypt-lib.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/90crypt/crypt-lib.sh	2015-03-24 15:17:12.866590774 +0100
++++ dracut-042/modules.d/90crypt/crypt-lib.sh	2015-06-24 18:02:28.878483104 +0200
-@@ -5,11 +5,20 @@
+@@ -5,11 +5,20 @@ command -v getarg >/dev/null || . /lib/d
  # check if the crypttab contains an entry for a LUKS UUID
  crypttab_contains() {
      local luks="$1"
 +    local _uuid _line
      local l d rest
      if [ -f /etc/crypttab ]; then
-         while read l d rest; do
+         while read l d rest || [ -n "$l" ]; do
              strstr "${l##luks-}" "${luks##luks-}" && return 0
              strstr "$d" "${luks##luks-}" && return 0
 +            if [ -e /usr/lib/dracut/modules.d/90crypt/block_uuid.map ]; then
@@ -42,19 +42,19 @@ Index: dracut-041/modules.d/90crypt/crypt-lib.sh
          done < /etc/crypttab
      fi
      return 1
-Index: dracut-041/modules.d/90crypt/module-setup.sh
+Index: dracut-042/modules.d/90crypt/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/90crypt/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/90crypt/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/90crypt/module-setup.sh	2015-03-24 15:17:12.866590774 +0100
++++ dracut-042/modules.d/90crypt/module-setup.sh	2015-06-24 18:02:28.882483333 +0200
-@@ -63,6 +63,7 @@
+@@ -63,6 +63,7 @@ install() {
          inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
      fi
  
 +    > /tmp/dracut_block_uuid.map
      if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
          # filter /etc/crypttab for the devices we need
-         while read _mapper _dev _rest; do
+         while read _mapper _dev _rest || [ -n "$_mapper" ]; do
-@@ -72,6 +73,8 @@
+@@ -72,6 +73,8 @@ install() {
              [[ $_dev == UUID=* ]] && \
                  _dev="/dev/disk/by-uuid/${_dev#UUID=}"
  
@@ -63,7 +63,7 @@ Index: dracut-041/modules.d/90crypt/module-setup.sh
              for _hdev in "${!host_fs_types[@]}"; do
                  [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
                  if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then
-@@ -84,6 +87,7 @@
+@@ -84,6 +87,7 @@ install() {
      fi
  
      inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"

0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch

@@ -8,14 +8,14 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  dracut-functions.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: dracut-041/dracut-functions.sh
+Index: dracut-042/dracut-functions.sh
 ===================================================================
---- dracut-041.orig/dracut-functions.sh	2015-03-24 15:12:43.423456648 +0100
+--- dracut-042.orig/dracut-functions.sh	2015-06-24 18:02:08.741336717 +0200
-+++ dracut-041/dracut-functions.sh	2015-03-24 15:17:15.610744959 +0100
++++ dracut-042/dracut-functions.sh	2015-06-24 18:02:29.194501095 +0200
-@@ -1657,7 +1657,7 @@
+@@ -1657,7 +1657,7 @@ find_kernel_modules_by_path () {
      _OLDIFS=$IFS
      IFS=:
-     while read a rest; do
+     while read a rest || [ -n "$a" ]; do
 -        [[ $a = */$1/* ]] || [[ $a = updates/* ]] || continue
 +        [[ $a = */$1/* ]] || [[ $a = updates/* ]] || [[ $a = extra/* ]] || [[ $a = weak-updates/* ]]  || continue
          printf "%s\n" "$srcmods/$a"

0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch

@@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  dracut.sh |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-Index: dracut-041/dracut.sh
+Index: dracut-042/dracut.sh
 ===================================================================
---- dracut-041.orig/dracut.sh	2015-03-24 15:16:01.578586094 +0100
+--- dracut-042.orig/dracut.sh	2015-06-24 18:02:21.906086174 +0200
-+++ dracut-041/dracut.sh	2015-03-24 15:17:20.507020068 +0100
++++ dracut-042/dracut.sh	2015-06-24 18:02:29.490517947 +0200
-@@ -1133,6 +1133,7 @@
+@@ -1191,6 +1191,7 @@ if [[ $hostonly ]]; then
          "/usr/lib64" \
          "/boot" \
          "/boot/efi" \

0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch

@@ -11,11 +11,11 @@ CC: Jan Loeser <jloeser@suse.de>
  dracut.sh           |   12 ++++++++++++
  2 files changed, 17 insertions(+), 1 deletions(-)
 
-Index: dracut-041/dracut-functions.sh
+Index: dracut-042/dracut-functions.sh
 ===================================================================
---- dracut-041.orig/dracut-functions.sh	2015-03-18 15:17:19.164428826 +0100
+--- dracut-042.orig/dracut-functions.sh	2015-06-24 18:02:29.194501095 +0200
-+++ dracut-041/dracut-functions.sh	2015-03-18 15:19:21.855346813 +0100
++++ dracut-042/dracut-functions.sh	2015-06-24 18:02:29.782534571 +0200
-@@ -1740,8 +1740,14 @@
+@@ -1740,8 +1740,14 @@ instmods() {
                          --set-version $kernel ${_moddirname} $_mpargs
                      ((_ret+=$?))
                  else
@@ -31,11 +31,11 @@ Index: dracut-041/dracut-functions.sh
                  fi
                  ;;
          esac
-Index: dracut-041/dracut.sh
+Index: dracut-042/dracut.sh
 ===================================================================
---- dracut-041.orig/dracut.sh	2015-03-18 15:11:37.169146866 +0100
+--- dracut-042.orig/dracut.sh	2015-06-24 18:02:29.490517947 +0200
-+++ dracut-041/dracut.sh	2015-03-18 15:17:19.172429202 +0100
++++ dracut-042/dracut.sh	2015-06-24 18:02:29.782534571 +0200
-@@ -841,6 +841,18 @@
+@@ -855,6 +855,18 @@ if [[ -n "$logfile" ]];then
      fi
  fi
  

0159-network-Try-to-load-xennet.patch

@@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  modules.d/40network/module-setup.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: dracut-041/modules.d/40network/module-setup.sh
+Index: dracut-042/modules.d/90kernel-network-modules/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/40network/module-setup.sh	2015-03-24 15:17:03.618071127 +0100
+--- dracut-042.orig/modules.d/90kernel-network-modules/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/40network/module-setup.sh	2015-03-24 15:17:30.915604891 +0100
++++ dracut-042/modules.d/90kernel-network-modules/module-setup.sh	2015-06-24 18:02:30.094552334 +0200
-@@ -68,7 +68,7 @@
+@@ -61,7 +61,7 @@ installkernel() {
          =drivers/net/phy \
          =drivers/net/team \
          =drivers/net/ethernet \

0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch

@@ -11,11 +11,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  modules.d/10i18n/module-setup.sh | 4 ++++
  1 file changed, 4 insertions(+)
 
-Index: dracut-041/modules.d/10i18n/module-setup.sh
+Index: dracut-042/modules.d/10i18n/module-setup.sh
 ===================================================================
---- dracut-041.orig/modules.d/10i18n/module-setup.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/10i18n/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/10i18n/module-setup.sh	2015-03-24 15:17:34.003778419 +0100
++++ dracut-042/modules.d/10i18n/module-setup.sh	2015-06-24 18:02:33.938771180 +0200
-@@ -219,6 +219,10 @@
+@@ -219,6 +219,10 @@ install() {
              print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
          fi
  

0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch

@@ -10,11 +10,11 @@ initramfs.
  dracut-initramfs-restore.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: dracut-041/dracut-initramfs-restore.sh
+Index: dracut-042/dracut-initramfs-restore.sh
 ===================================================================
---- dracut-041.orig/dracut-initramfs-restore.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/dracut-initramfs-restore.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/dracut-initramfs-restore.sh	2015-03-24 15:17:38.404025658 +0100
++++ dracut-042/dracut-initramfs-restore.sh	2015-06-24 18:02:34.238788260 +0200
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@ mount -o ro /boot &>/dev/null
  if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
      IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
  fi

0165-Order-root-fsck-after-pre-mount.patch

@@ -1,11 +1,11 @@
 From: Andrei Borzenkov <arvidjaar@gmail.com>
 Subject: ensure pre-mount (and resume) run before root fsck
 References: bnc#906592
-Index: dracut-041/modules.d/98systemd/rootfs-generator.sh
+Index: dracut-042/modules.d/98dracut-systemd/rootfs-generator.sh
 ===================================================================
---- dracut-041.orig/modules.d/98systemd/rootfs-generator.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/98dracut-systemd/rootfs-generator.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/98systemd/rootfs-generator.sh	2015-03-24 15:17:43.364304355 +0100
++++ dracut-042/modules.d/98dracut-systemd/rootfs-generator.sh	2015-06-24 18:02:34.526804656 +0200
-@@ -64,6 +64,23 @@
+@@ -65,6 +65,23 @@ generator_mount_rootfs()
      fi
  }
  
@@ -29,11 +29,11 @@ Index: dracut-041/modules.d/98systemd/rootfs-generator.sh
  root=$(getarg root=)
  case "$root" in
      block:LABEL=*|LABEL=*)
-@@ -92,6 +109,7 @@
+@@ -95,6 +112,7 @@ GENERATOR_DIR="$1"
  
  if [ "${root%%:*}" = "block" ]; then
     generator_wait_for_dev "${root#block:}" "$RDRETRY"
 +   generator_fsck_after_pre_mount "${root#block:}"
-    grep -q 'root=' /proc/cmdline || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)"
+    strstr "$(cat /proc/cmdline)" 'root=' || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)"
  fi
  

0168-remove_plymouth_logo_file.patch

@@ -1,7 +1,7 @@
-Index: dracut-041/modules.d/50plymouth/plymouth-populate-initrd.sh
+Index: dracut-042/modules.d/50plymouth/plymouth-populate-initrd.sh
 ===================================================================
---- dracut-041.orig/modules.d/50plymouth/plymouth-populate-initrd.sh	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/50plymouth/plymouth-populate-initrd.sh	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/50plymouth/plymouth-populate-initrd.sh	2015-03-24 15:17:46.828499010 +0100
++++ dracut-042/modules.d/50plymouth/plymouth-populate-initrd.sh	2015-06-24 18:02:34.814821053 +0200
 @@ -1,10 +1,8 @@
  #!/bin/bash
  

0170-enable-logitech-hidpp.patch

@@ -1,15 +0,0 @@
-Index: dracut-041/modules.d/90kernel-modules/module-setup.sh
-===================================================================
---- dracut-041.orig/modules.d/90kernel-modules/module-setup.sh	2015-03-18 15:28:37.954700132 +0100
-+++ dracut-041/modules.d/90kernel-modules/module-setup.sh	2015-03-18 15:29:06.348300969 +0100
-@@ -43,8 +43,8 @@
- 
-         instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
-             atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
--            hid-logitech-dj hid-microsoft hid-lcpower firewire-ohci \
--            pcmcia hid-hyperv hv-vmbus hyperv-keyboard
-+            hid-logitech-dj hid-logitech-hidpp hid-microsoft hid-lcpower \
-+	    firewire-ohci pcmcia hid-hyperv hv-vmbus hyperv-keyboard
- 
-         if [[ "$(uname -p)" == arm* ]]; then
-             # arm specific modules

dracut-041.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251
-size 268288

dracut-043.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1
+size 272744

dracut-installkernel

@@ -80,13 +80,31 @@ if [ -x /sbin/depmod -a -d /lib/modules/$KERNEL_VERSION ]; then
     /sbin/depmod $KERNEL_VERSION;
 fi
 
-CONFIG=$(dirname $MAPFILE)/.config
+function check_supported()
-CHECK_SUPPORTED=
+{
-if [ -e "$CONFIG" ]; then
+   local MOD_SUPP_FILE="/etc/modprobe.d/10-unsupported-modules.conf"
-    if grep -q "^CONFIG_SUSE_KERNEL_SUPPORTED=y" $CONFIG ; then
+   local MOD_SUPP_REGEX="^\s*allow_unsupported_modules\s+0\s*$"
+   local cfg="$1"
+
+   if [ ! -e "$cfg" ]; then return; fi
+
+   local tmp=$(modprobe --showconfig | grep -Eq $MOD_SUPP_REGEX)
+   if [ -n "$tmp" ]; then
+       CHECK_SUPPORTED="--check-supported"
+       return;
+   fi
+
+   if grep -q "^CONFIG_SUSE_KERNEL_SUPPORTED=y" $cfg ; then
+       if [ -e $MOD_SUPP_FILE ] && grep -Eq $MOD_SUPP_REGEX $MOD_SUPP_FILE; then
            CHECK_SUPPORTED="--check-supported"
        fi
-fi
+   fi
+}
+
+CONFIG=$(dirname $MAPFILE)/.config
+CHECK_SUPPORTED=
+
+check_supported $CONFIG
 
 KERNTYPES=$(dirname $MAPFILE)/init/kerntypes.o
 if [ -e $KERNTYPES ]; then

dracut.changes

@@ -1,3 +1,112 @@
+-------------------------------------------------------------------
+Thu Jul  2 12:59:27 UTC 2015 - trenn@suse.de
+
+- Update to version 043
+  Minor change: add missing dmsquash-generator
+
+-------------------------------------------------------------------
+Wed Jun 24 16:06:36 UTC 2015 - trenn@suse.de
+
+- Fix dmraid issue bnc#905746
+A    dracut_dmraid_use_udev.patch
+- Taken over from SLE12
+A    fips_add_aesni-intel.patch
+- Do not touch /run vs /var/run bnc#922676
+D    0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch
+- Update dracut to version 042
+Remove these already included or unneeded patches:
+D    dracut_v041_to_HEAD.patch
+D    0011-Correct-paths-for-openSUSE.patch
+D    0068-95fcoe-uefi-Test-for-EFI-firmware.patch
+D    0170-enable-logitech-hidpp.patch
+- Fix nfs mount if IPv4 is used in fstab instead of hostname
+A fix_nfs_with_ip_instead_of_hostname.patch
+
+Adjust/refresh:
+M    0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
+M    0016-Add-new-s390x-specific-rule-files.patch
+M    0017-45ifcfg-use-distro-specific-scripts.patch
+M    0019-40network-Fix-race-condition-when-wait-for-networks.patch
+M    0020-00warpclock-Set-correct-timezone.patch
+M    0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
+M    0048-40network-Only-enable-network-interfaces-if-explicit.patch
+M    0053-01fips-fixup-loading-issues.patch
+M    0056-81cio_ignore-handle-cio_ignore-commandline.patch
+M    0057-01fips-Include-some-more-hmacs.patch
+M    0058-dracut-add-warning-when-including-unsupported-module.patch
+M    0059-99suse-Add-SUSE-specific-initrd-parsing.patch
+M    0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch
+M    0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch
+M    0066-40network-always-start-netroot-in-ifup.sh.patch
+M    0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch
+M    0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch
+M    0079-95dasd_rules-fixup-rd.dasd-parsing.patch
+M    0080-95dasd_rules-print-out-rd.dasd-commandline.patch
+M    0081-95dasd_mod-do-not-set-module-parameters-if-dasd_cio_.patch
+M    0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch
+M    0085-95zfcp_rules-print-out-rd.zfcp-commandline-parameter.patch
+M    0086-95zfcp_rules-Auto-generate-udev-rule-for-ipl-device.patch
+M    0087-95dasd_rules-Auto-generate-udev-rule-for-ipl-device.patch
+M    0088-91zipl-Add-new-module-to-update-s390x-configuration.patch
+M    0089-40network-create-var-lib-wicked-in-ifup.sh.patch
+M    0090-dracut-caps-Remove-whole-caps-module.patch
+M    0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch
+M    0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch
+M    0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch
+M    0107-Fixup-typo-firmare-instead-of-firmware.patch
+M    0108-91zipl-Store-commandline-correctly.patch
+M    0109-95dasd_rules-Store-all-devices-in-commandline.patch
+M    0110-95zfcp_rules-Store-all-devices-in-commandline.patch
+M    0113-91zipl-Install-script-as-executable.patch
+M    0114-91zipl-Translate-ext2-3-into-ext4.patch
+M    0116-Mark-scripts-as-executable.patch
+M    0117-95dasd_rules-Enable-the-device-before-checking-devic.patch
+M    0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch
+M    0119-Reset-IFS-variable.patch
+M    0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch
+M    0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch
+M    0122-Get_kernel_version_from_gz_file_for_arm.patch
+M    0123-95zfcp_rules-fix-typo-in-module_setup.patch
+M    0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
+M    0125-40network-separate-mask-and-prefix.patch
+M    0126-01fips-Add-drbg-module-to-force-loaded-modules.patch
+M    0130-nfs-Always-add-all-kernel-modules-for-kdump.patch
+M    0131-40network-handle-prefixed-IP-addresses-correctly.patch
+M    0132-40network-fixup-static-network-configuration.patch
+M    0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch
+M    0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch
+M    0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch
+M    0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
+M    0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch
+M    0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch
+M    0159-network-Try-to-load-xennet.patch
+M    0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch
+M    0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
+M    0165-Order-root-fsck-after-pre-mount.patch
+M    0168-remove_plymouth_logo_file.patch
+M    dracut_fix_multipath_without_config.patch
+
+-------------------------------------------------------------------
+Wed May 20 11:44:59 UTC 2015 - trenn@suse.de
+
+- Fix mkinitrd (get_kernel_version) for arm* arch by getting kernel version
+  from vmlinux.*.gz file instead of [uz]Image file.
+  Taken over from mkinitrd bnc#908454
+*Add patch 0122-Get_kernel_version_from_gz_file_for_arm.patch
+- Fix nfs ip= setup in case of IP instead of host in root= name (bsc#931307)
+- Honor allow_unsupported_modules setting
+  From: Borislav Petkov <bp@suse.de>
+  $ make install
+
+of a locally built kernel, you don't want dracut to do --check-supported
+for supported modules when you have "allow_unsupported_modules 1" in
+/etc/modprobe.d/10-unsupported-modules.conf.
+
+Teach /sbin/installkernel to pay attention to that setting.
+
+Use modprobe --showconfig too, which is going to be the proper way to do
+it starting with 12SP1.
+
 -------------------------------------------------------------------
 Fri May  8 06:30:32 UTC 2015 - trenn@suse.de
 

dracut.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dracut
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define dracutlibdir %{_libexecdir}/dracut
 
 Name:           dracut
-Version:        041
+Version:        043
 Release:        0
 Summary:        Initramfs generator using udev
 License:        GPL-2.0+ and LGPL-2.1+
@@ -30,13 +30,10 @@ Source3:        mkinitrd_setup_dummy
 Source4:        purge-kernels
 Source5:        purge-kernels.service
 Source6:        dracut-installkernel
-Patch1:         dracut_v041_to_HEAD.patch
 
 # Sent mainline
-Patch11:        0011-Correct-paths-for-openSUSE.patch
 Patch12:        0019-40network-Fix-race-condition-when-wait-for-networks.patch
 Patch13:        0066-40network-always-start-netroot-in-ifup.sh.patch
-Patch14:        0068-95fcoe-uefi-Test-for-EFI-firmware.patch
 
 #Network:
 Patch15:        0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
@@ -77,13 +74,14 @@ Patch117:       0117-95dasd_rules-Enable-the-device-before-checking-devic.patch
 Patch118:       0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch
 Patch123:       0123-95zfcp_rules-fix-typo-in-module_setup.patch
 Patch157:       0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch
+Patch116:       0116-Mark-scripts-as-executable.patch
 
 #FIPS
 Patch53:        0053-01fips-fixup-loading-issues.patch
 Patch57:        0057-01fips-Include-some-more-hmacs.patch
-Patch116:       0116-Mark-scripts-as-executable.patch
 Patch126:       0126-01fips-Add-drbg-module-to-force-loaded-modules.patch
 Patch137:       0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch
+Patch138:       fips_add_aesni-intel.patch
 
 # Others
 Patch20:        0020-00warpclock-Set-correct-timezone.patch
@@ -91,10 +89,10 @@ Patch58:        0058-dracut-add-warning-when-including-unsupported-module.patch
 Patch59:        0059-99suse-Add-SUSE-specific-initrd-parsing.patch
 Patch90:        0090-dracut-caps-Remove-whole-caps-module.patch
 Patch91:        0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch
-Patch106:       0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch
 Patch119:       0119-Reset-IFS-variable.patch
 Patch120:       0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch
 Patch121:       0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch
+Patch122:       0122-Get_kernel_version_from_gz_file_for_arm.patch
 Patch130:       0130-nfs-Always-add-all-kernel-modules-for-kdump.patch
 Patch144:       0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch
 Patch150:       0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
@@ -103,7 +101,6 @@ Patch163:       0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch
 Patch164:       0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
 Patch165:       0165-Order-root-fsck-after-pre-mount.patch
 Patch168:       0168-remove_plymouth_logo_file.patch
-Patch170:       0170-enable-logitech-hidpp.patch
 
 # Still needed
 Patch133:       0133-Allow-multiple-configurations-per-network-interface-.patch
@@ -113,6 +110,8 @@ Patch162:       0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
 
 # Submit mainline asap
 Patch200:       dracut_fix_multipath_without_config.patch
+Patch201:       fix_nfs_with_ip_instead_of_hostname.patch
+Patch202:       dracut_dmraid_use_udev.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -166,11 +165,8 @@ and its cryptography during startup.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -198,7 +194,6 @@ and its cryptography during startup.
 %patch90 -p1
 %patch91 -p1
 %patch94 -p1
-%patch106 -p1
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
@@ -211,6 +206,7 @@ and its cryptography during startup.
 %patch119 -p1
 %patch120 -p1
 %patch121 -p1
+%patch122 -p1
 %patch123 -p1
 %patch124 -p1
 %patch125 -p1
@@ -226,6 +222,8 @@ and its cryptography during startup.
 #%patch162 -p1
 
 %patch137 -p1
+%patch138 -p1
+
 %patch142 -p1
 %patch144 -p1
 %patch150 -p1
@@ -236,16 +234,17 @@ and its cryptography during startup.
 %patch164 -p1
 %patch165 -p1
 %patch168 -p1
-%patch170 -p1
 
 %patch200 -p1
+%patch201 -p1
+%patch202 -p1
 
 %build
 %configure\
   --systemdsystemunitdir=%{_unitdir}\
   --bashcompletiondir=%{_sysconfdir}/bash_completion.d\
   --libdir=%{_prefix}/lib
-make all -e CFLAGS="%{optflags}" %{?_smp_mflags}
+make all CFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
@@ -344,6 +343,7 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 /sbin/mkinitrd
 /sbin/mkinitrd_setup
 %config %{_sysconfdir}/bash_completion.d/lsinitrd
+/usr/share/pkgconfig/dracut.pc
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
 %{dracutlibdir}/skipcpio
@@ -387,6 +387,9 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %{dracutlibdir}/modules.d/00bash
 %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh
 %{dracutlibdir}/modules.d/00warpclock
+%{dracutlibdir}/modules.d/00systemd
+%{dracutlibdir}/modules.d/01systemd-initrd
+%{dracutlibdir}/modules.d/02systemd-networkd
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue/module-setup.sh
 %{dracutlibdir}/modules.d/04watchdog
@@ -411,6 +414,7 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
 %{dracutlibdir}/modules.d/90qemu
+%{dracutlibdir}/modules.d/90kernel-network-modules
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/91zipl
@@ -440,7 +444,7 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %{dracutlibdir}/modules.d/98pollcdrom
 %{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98syslog
-%{dracutlibdir}/modules.d/98systemd
+%{dracutlibdir}/modules.d/98dracut-systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
 %{dracutlibdir}/modules.d/99fs-lib
@@ -454,16 +458,14 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh
 %attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh
 %attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh
-%attr(0755,root,root) %{dracutlibdir}/modules.d/30convertfs/convertrunfs.sh
 %attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/dracut
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
-%if %{defined _unitdir}
 %dir %{_unitdir}/initrd.target.wants
 %{_unitdir}/*.service
 %{_unitdir}/*/*.service
-%endif
+%dir %{_unitdir}/sysinit.target.wants
 %config %{_sysconfdir}/bash_completion.d/dracut
 %dir /boot/dracut
 %dir %{_localstatedir}/lib/dracut

dracut_dmraid_use_udev.patch

@@ -0,0 +1,36 @@
+From: Hannes Reinecke <hare@suse.com>
+
+Use udev rules to create dmraid /dev/mapper/ devices
+
+https://bugzilla.opensuse.org/show_bug.cgi?id=905746
+
+---
+ modules.d/90dmraid/dmraid.sh       | 3 ---
+ modules.d/90dmraid/module-setup.sh | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+Index: dracut-042/modules.d/90dmraid/dmraid.sh
+===================================================================
+--- dracut-042.orig/modules.d/90dmraid/dmraid.sh	2015-06-11 17:39:47.000000000 +0200
++++ dracut-042/modules.d/90dmraid/dmraid.sh	2015-06-24 18:02:36.882938788 +0200
+@@ -26,8 +26,6 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd
+                 if [ "${s##$r}" != "$s" ]; then
+                     info "Activating $s"
+                     dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+-                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
+-                    udevsettle
+                 fi
+             done
+         done
+Index: dracut-042/modules.d/90dmraid/module-setup.sh
+===================================================================
+--- dracut-042.orig/modules.d/90dmraid/module-setup.sh	2015-06-11 17:39:47.000000000 +0200
++++ dracut-042/modules.d/90dmraid/module-setup.sh	2015-06-24 18:02:36.882938788 +0200
+@@ -74,6 +74,8 @@ install() {
+ 
+     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
+ 
++    66-kpartx.rules 67-kpartx-compat.rules
++
+     inst_libdir_file "libdmraid-events*.so*"
+ 
+     inst_rules "$moddir/61-dmraid-imsm.rules"

dracut_fix_multipath_without_config.patch

@@ -15,11 +15,11 @@ Condition: start condition failed at Thu 2015-05-07 11:49:11 CEST; 7min ago
 and exit to dracut shell.
 
 
-Index: dracut-041/modules.d/90multipath/multipathd.service
+Index: dracut-042/modules.d/90multipath/multipathd.service
 ===================================================================
---- dracut-041.orig/modules.d/90multipath/multipathd.service	2015-01-31 12:54:52.000000000 +0100
+--- dracut-042.orig/modules.d/90multipath/multipathd.service	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-041/modules.d/90multipath/multipathd.service	2015-05-08 08:13:22.714063510 +0200
++++ dracut-042/modules.d/90multipath/multipathd.service	2015-06-24 18:02:36.298905539 +0200
-@@ -6,7 +6,6 @@
+@@ -6,7 +6,6 @@ Conflicts=shutdown.target
  ConditionKernelCommandLine=!nompath
  ConditionKernelCommandLine=!rd.multipath=0
  ConditionKernelCommandLine=!rd_NO_MULTIPATH

dracut_v041_to_HEAD.patch

@@ -1,316 +0,0 @@
-diff --git a/50-dracut.install b/50-dracut.install
-index 5ac74f1..d05abb9 100755
---- a/50-dracut.install
-+++ b/50-dracut.install
-@@ -20,6 +20,8 @@ case "$COMMAND" in
- 
-         if [[ -f /etc/kernel/cmdline ]]; then
-             readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
-+        elif [[ -f /usr/lib/kernel/cmdline ]]; then
-+            readarray -t BOOT_OPTIONS < /usr/lib/kernel/cmdline
-         fi
- 
-         if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
-diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
-index 9fb0c5d..9abd9d7 100755
---- a/51-dracut-rescue.install
-+++ b/51-dracut-rescue.install
-@@ -41,6 +41,8 @@ fi
- 
- if [[ -f /etc/kernel/cmdline ]]; then
-     readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
-+elif [[ -f /usr/lib/kernel/cmdline ]]; then
-+    readarray -t BOOT_OPTIONS < /usr/lib/kernel/cmdline
- fi
- if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
-     read -ar BOOT_OPTIONS < /proc/cmdline
-diff --git a/dracut.8.asc b/dracut.8.asc
-index 7d11f43..9aecbfb 100644
---- a/dracut.8.asc
-+++ b/dracut.8.asc
-@@ -31,7 +31,7 @@ early userspace.
- For a complete list of kernel command line options see *dracut.cmdline*(7).
- 
- If you are dropped to an emergency shell, while booting your initramfs,
--the file _/run/initramfs/rdsosreport.txt_ is created, which can be safed to a
-+the file _/run/initramfs/rdsosreport.txt_ is created, which can be saved to a
- (to be mounted by hand) partition (usually /boot) or a USB stick.
- Additional debugging info can be produced by adding **rd.debug** to the kernel
- command line. _/run/initramfs/rdsosreport.txt_ contains all logs and the output
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
-index 5ff84ef..e51fd1b 100644
---- a/dracut.cmdline.7.asc
-+++ b/dracut.cmdline.7.asc
-@@ -163,7 +163,7 @@ Misc
- Debug
- ~~~~~
- If you are dropped to an emergency shell, the file 
--_/run/initramfs/rdsosreport.txt_ is created, which can be safed to a (to be
-+_/run/initramfs/rdsosreport.txt_ is created, which can be saved to a (to be
- mounted by hand) partition (usually /boot) or a USB stick. Additional debugging
- info can be produced by adding **rd.debug** to the kernel command line.
- _/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools.
-@@ -834,11 +834,27 @@ Enables debug output from the live boot process.
- Specifies the directory within the squashfs where the ext3fs.img or rootfs.img
- can be found.  By default, this is __LiveOS__.
- 
-+**rd.live.ram=**1::
-+Copy the complete image to RAM and use this for booting. This is useful
-+when the image resides on i.e. a DVD which needs to be ejected later on.
-+
-+**rd.live.overlay.thin=**1::
-+Enables the usage of thin snapshots instead of classic dm snapshots.
-+The advantage of thin snapshots is, that they support discards, and will free
-+blocks which are not claimed by the filesystem. In this use case this means,
-+that memory is given back to the kernel, when the filesystem does not claim it
-+anymore.
-+
- **rd.writable.fsimg=**1::
- Enables writable filesystem support.  The system will boot with a fully 
- writable filesystem without snapshots __(see notes above about available live boot options)__.
- You can use the **rootflags** option to set mount options for the live
- filesystem as well __(see documentation about rootflags in the **Standard** section above)__.
-+This implies that the whole image is copied to RAM before the boot continues.
-++
-+NOTE: There must be enough free RAM available to hold the complete image.
-++
-+This method is very suitable for diskless boots.
- 
- 
- Plymouth Boot Splash
-diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
-index b6c769c..b126b09 100644
---- a/dracut.conf.d/fedora.conf.example
-+++ b/dracut.conf.d/fedora.conf.example
-@@ -15,4 +15,5 @@ systemdsystemunitdir=/usr/lib/systemd/system
- systemdsystemconfdir=/etc/systemd/system
- udevdir=/usr/lib/udev
- hostonly="yes"
-+hostonly_cmdline="no"
- early_microcode="yes"
-diff --git a/dracut.sh b/dracut.sh
-index 5e2feba..17bf8f2 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/bash --norc
- #
- # Generator script for a dracut initramfs
- # Tries to retain some degree of compatibility with the command line
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index d232d58..aacbc95 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -14,7 +14,7 @@ depends() {
- installkernel() {
-     local _fipsmodules _mod
-     _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
--    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod "
-+    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
-     _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
-     _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
-     _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
-diff --git a/modules.d/90dm/dm-shutdown.sh b/modules.d/90dm/dm-shutdown.sh
-index dfdb48b..04c89be 100755
---- a/modules.d/90dm/dm-shutdown.sh
-+++ b/modules.d/90dm/dm-shutdown.sh
-@@ -1,11 +1,12 @@
- #!/bin/sh
- 
- _do_dm_shutdown() {
--    local ret
-+    local ret=0
-     local final=$1
-     info "Disassembling device-mapper devices"
--    dmsetup -v remove_all
--    ret=$?
-+    for dev in $(dmsetup info -c --noheadings -o name) ; do
-+        dmsetup -v --noudevsync remove "$dev" || ret=$?
-+    done
-     if [ "x$final" != "x" ]; then
-         info "dmsetup ls --tree"
-         dmsetup ls --tree 2>&1 | vinfo
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index 9c08e94..b632f6a 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -30,6 +30,8 @@ getargbool 0 rd.writable.fsimg -d -y writable_fsimg && writable_fsimg="yes"
- overlay_size=$(getarg rd.live.overlay.size=)
- [ -z "$overlay_size" ] && overlay_size=512
- 
-+getargbool 0 rd.live.overlay.thin && thin_snapshot="yes"
-+
- # CD/DVD media check
- [ -b $livedev ] && fs=$(blkid -s TYPE -o value $livedev)
- if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
-@@ -146,7 +148,31 @@ do_live_overlay() {
-         base=$BASE_LOOPDEV
-         over=$OVERLAY_LOOPDEV
-     fi
--    echo 0 $sz snapshot $base $over p 8 | dmsetup create live-rw
-+
-+    if [ -n "$thin_snapshot" ]; then
-+        modprobe dm_thin_pool
-+        mkdir /run/initramfs/thin-overlay
-+
-+        # In block units (512b)
-+        thin_data_sz=$(( $overlay_size * 1024 * 1024 / 512 ))
-+        thin_meta_sz=$(( $thin_data_sz / 10 ))
-+
-+        # It is important to have the backing file on a tmpfs
-+        # this is needed to let the loopdevice support TRIM
-+        dd if=/dev/null of=/run/initramfs/thin-overlay/meta bs=1b count=1 seek=$((thin_meta_sz)) 2> /dev/null
-+        dd if=/dev/null of=/run/initramfs/thin-overlay/data bs=1b count=1 seek=$((thin_data_sz)) 2> /dev/null
-+
-+        THIN_META_LOOPDEV=$( losetup --show -f /run/initramfs/thin-overlay/meta )
-+        THIN_DATA_LOOPDEV=$( losetup --show -f /run/initramfs/thin-overlay/data )
-+
-+        echo 0 $thin_data_sz thin-pool $THIN_META_LOOPDEV $THIN_DATA_LOOPDEV 1024 1024 | dmsetup create live-overlay-pool
-+        dmsetup message /dev/mapper/live-overlay-pool 0 "create_thin 0"
-+
-+        # Create a snapshot of the base image
-+        echo 0 $sz thin /dev/mapper/live-overlay-pool 0 $base | dmsetup create live-rw
-+    else
-+        echo 0 $sz snapshot $base $over p 8 | dmsetup create live-rw
-+    fi
- 
-     # Create a device that always points to a ro base image
-     echo 0 $sz linear $base 0 | dmsetup create --readonly live-base
-@@ -174,29 +200,6 @@ if [ -n "$OSMINSQFS" ]; then
-     umount -l /run/initramfs/squashfs.osmin
- fi
- 
--# we might have an embedded fs image to use as rootfs (uncompressed live)
--if [ -e /run/initramfs/live/${live_dir}/ext3fs.img ]; then
--    FSIMG="/run/initramfs/live/${live_dir}/ext3fs.img"
--elif [ -e /run/initramfs/live/${live_dir}/rootfs.img ]; then
--    FSIMG="/run/initramfs/live/${live_dir}/rootfs.img"
--fi
--
--if [ -n "$FSIMG" ] ; then
--    BASE_LOOPDEV=$( losetup -f )
--
--    if [ -n "$writable_fsimg" ] ; then
--        # mount the provided fileysstem read/write
--        echo "Unpacking live filesystem (may take some time)"
--        unpack_archive $FSIMG /run/initramfs/fsimg/
--        losetup $BASE_LOOPDEV /run/initramfs/fsimg/rootfs.img
--        echo "0 $( blockdev --getsize $BASE_LOOPDEV ) linear $BASE_LOOPDEV 0" | dmsetup create live-rw
--    else
--        # mount the filesystem read-only and add a dm snapshot for writes
--        losetup -r $BASE_LOOPDEV $FSIMG
--        do_live_from_base_loop
--    fi
--fi
--
- # we might have an embedded fs image on squashfs (compressed live)
- if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
-     SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
-@@ -217,18 +220,42 @@ if [ -e "$SQUASHED" ] ; then
-     mkdir -m 0755 -p /run/initramfs/squashfs
-     mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /run/initramfs/squashfs
- 
--    BASE_LOOPDEV=$( losetup -f )
--    if [ -f /run/initramfs/squashfs/LiveOS/ext3fs.img ]; then
--        losetup -r $BASE_LOOPDEV /run/initramfs/squashfs/LiveOS/ext3fs.img
--    elif [ -f /run/initramfs/squashfs/LiveOS/rootfs.img ]; then
--        losetup -r $BASE_LOOPDEV /run/initramfs/squashfs/LiveOS/rootfs.img
--    fi
-+fi
-+
-+# we might have an embedded fs image to use as rootfs (uncompressed live)
-+if [ -e /run/initramfs/live/${live_dir}/ext3fs.img ]; then
-+    FSIMG="/run/initramfs/live/${live_dir}/ext3fs.img"
-+elif [ -e /run/initramfs/live/${live_dir}/rootfs.img ]; then
-+    FSIMG="/run/initramfs/live/${live_dir}/rootfs.img"
-+elif [ -f /run/initramfs/squashfs/LiveOS/ext3fs.img ]; then
-+    FSIMG="/run/initramfs/squashfs/LiveOS/ext3fs.img"
-+elif [ -f /run/initramfs/squashfs/LiveOS/rootfs.img ]; then
-+    FSIMG="/run/initramfs/squashfs/LiveOS/rootfs.img"
-+fi
- 
--    umount -l /run/initramfs/squashfs
-+if [ -n "$FSIMG" ] ; then
-+    BASE_LOOPDEV=$( losetup -f )
- 
--    do_live_from_base_loop
-+    if [ -n "$writable_fsimg" ] ; then
-+        # mount the provided fileysstem read/write
-+        echo "Unpacking live filesystem (may take some time)"
-+        mkdir /run/initramfs/fsimg/
-+        if [ -n "$SQUASHED" ]; then
-+            cp -v $FSIMG /run/initramfs/fsimg/rootfs.img
-+        else
-+            unpack_archive $FSIMG /run/initramfs/fsimg/
-+        fi
-+        losetup $BASE_LOOPDEV /run/initramfs/fsimg/rootfs.img
-+        echo "0 $( blockdev --getsize $BASE_LOOPDEV ) linear $BASE_LOOPDEV 0" | dmsetup create live-rw
-+    else
-+        # mount the filesystem read-only and add a dm snapshot for writes
-+        losetup -r $BASE_LOOPDEV $FSIMG
-+        do_live_from_base_loop
-+    fi
- fi
- 
-+[ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
-+
- if [ -b "$OSMIN_LOOPDEV" ]; then
-     # set up the devicemapper snapshot device, which will merge
-     # the normal live fs image, and the delta, into a minimzied fs image
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index c799a1c..8269078 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -67,6 +67,20 @@ install() {
-             sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 4/' ${initdir}/etc/lvm/lvm.conf
-             sed -i -e 's/\(^[[:space:]]*\)use_lvmetad[[:space:]]*=[[:space:]]*[[:digit:]]/\1use_lvmetad = 0/' ${initdir}/etc/lvm/lvm.conf
-         fi
-+
-+        export LVM_SUPPRESS_FD_WARNINGS=1
-+        # Also install any files needed for LVM system id support.
-+        if [ -f /etc/lvm/lvmlocal.conf ]; then
-+            inst_simple -H /etc/lvm/lvmlocal.conf
-+        fi
-+        eval $(lvm dumpconfig global/system_id_source)
-+        if [ "$system_id_source" == "file" ]; then
-+            eval $(lvm dumpconfig global/system_id_file)
-+            if [ -f "$system_id_file" ]; then
-+                inst_simple -H $system_id_file
-+            fi
-+        fi
-+        unset LVM_SUPPRESS_FD_WARNINGS
-     fi
- 
-     if ! [[ -e ${initdir}/etc/lvm/lvm.conf ]]; then
-diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
-index 51ea288..761349f 100755
---- a/modules.d/98systemd/module-setup.sh
-+++ b/modules.d/98systemd/module-setup.sh
-@@ -176,7 +176,11 @@ install() {
-     # install adm user/group for journald
-     inst_multiple nologin
-     egrep '^systemd-journal:' "$initdir/etc/passwd" 2>/dev/null >> "$initdir/etc/passwd"
-+    egrep '^wheel:' "$initdir/etc/passwd" 2>/dev/null >> "$initdir/etc/passwd"
-+    egrep '^adm:' "$initdir/etc/passwd" 2>/dev/null >> "$initdir/etc/passwd"
-     egrep '^systemd-journal:' /etc/group >> "$initdir/etc/group"
-+    egrep '^wheel:' /etc/group >> "$initdir/etc/group"
-+    egrep '^adm:' /etc/group >> "$initdir/etc/group"
- 
-     ln_r $systemdutildir/systemd "/init"
-     ln_r $systemdutildir/systemd "/sbin/init"
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 5c1504f..079c9a2 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1286,8 +1286,8 @@ show_memstats()
- remove_hostonly_files() {
-     rm -fr /etc/cmdline /etc/cmdline.d/*.conf
-     if [ -f /lib/dracut/hostonly-files ]; then
--        while read line; do
--            [ -e "$line" ] || continue
-+        while read -r line; do
-+            [ -e "$line" ] || [ -h "$line" ] || continue
-             rm -f "$line"
-         done < /lib/dracut/hostonly-files
-     fi

fips_add_aesni-intel.patch

@@ -0,0 +1,13 @@
+Index: dracut-042/modules.d/01fips/module-setup.sh
+===================================================================
+--- dracut-042.orig/modules.d/01fips/module-setup.sh	2015-06-26 09:52:08.837700391 +0200
++++ dracut-042/modules.d/01fips/module-setup.sh	2015-06-26 09:53:16.613565464 +0200
+@@ -20,7 +20,7 @@ installkernel() {
+     _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
+     _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
+     _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "                      
+-    _fipsmodules+="ghash-clmulni-intel "                                       
++    _fipsmodules+="ghash-clmulni-intel aesni-intel "
+ 
+     _fipsmodules+="drbg"
+ 

fix_nfs_with_ip_instead_of_hostname.patch

@@ -0,0 +1,16 @@
+Index: dracut-041/modules.d/95nfs/module-setup.sh
+===================================================================
+--- dracut-041.orig/modules.d/95nfs/module-setup.sh	2015-05-20 13:37:53.910262273 +0200
++++ dracut-041/modules.d/95nfs/module-setup.sh	2015-05-21 16:16:35.742683551 +0200
+@@ -51,9 +51,9 @@
+ 
+     ### ip= ###
+     if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device = \[.*\] ]]; then
+-        nfs_address="$nfs_device"
++        nfs_address="${nfs_device%%:*}"
+     else
+-        lookup=$(host $(echo ${nfs_device%%:*})| head -n1)
++        lookup=$(host "${nfs_device%%:*}"| head -n1)
+         nfs_address=${lookup##* }
+     fi
+     ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')