Accepting request 616866 from home:dmolkentin:branches:Base:System

- 40network: Fix static network setup (bsc#1091099)
  * adds 0571-40network-Fix-static-network-setup.patch
- lsinitrd: Fix cat: write error: Broken pipe error (bsc#1094603)
  * adds 0572-lsinitrd-no-more-cat-write-error-Broken-pipe.patch
  * adds 0573-lsinitrd.sh-quote-filename-in-extract_files.patch

OBS-URL: https://build.opensuse.org/request/show/616866
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=352

0571-40network-Fix-static-network-setup.patch

@@ -0,0 +1,28 @@
+From a3fdbedce43956881ca01c94543b22e37d205da6 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Thu, 14 Jun 2018 14:18:44 +0200
+Subject: [PATCH] 40network: Fix static network setup
+
+Patch-by: Thomas Blume <tblume@suse.com>
+
+References: bsc#1091099
+---
+ modules.d/40network/ifup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 2d93cebd..13564778 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -275,7 +275,7 @@ do_ifcfg() {
+             dhcp*)
+                 do_dhcp -4 ;;
+             *)
+-                do_static ;;
++                ;;
+         esac
+         # loop over all configurations in ifcfg-$netif (IPADDR*) and apply
+         for conf in ${!IPADDR@}; do
+-- 
+2.16.3
+

0572-lsinitrd-no-more-cat-write-error-Broken-pipe.patch

@@ -0,0 +1,44 @@
+From b2e09d1d444e771493c26c576256f962bd8869f3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 16 Jan 2018 12:14:15 +0100
+Subject: [PATCH 1/2] lsinitrd: no more cat: write error: Broken pipe
+
+silence the cat
+---
+ lsinitrd.sh | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/lsinitrd.sh b/lsinitrd.sh
+index 1e4d99ac..9c7a178b 100755
+--- a/lsinitrd.sh
++++ b/lsinitrd.sh
+@@ -120,7 +120,7 @@ extract_files()
+     for f in "${!filenames[@]}"; do
+         [[ $nofileinfo ]] || echo "initramfs:/$f"
+         [[ $nofileinfo ]] || echo "========================================================================"
+-        $CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
++        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
+         ((ret+=$?))
+         [[ $nofileinfo ]] || echo "========================================================================"
+         [[ $nofileinfo ]] || echo
+@@ -139,15 +139,14 @@ list_files()
+ {
+     echo "========================================================================"
+     if [ "$sorted" -eq 1 ]; then
+-        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
++        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --list | sort -n -k5
+     else
+-        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
++        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --list | sort -k9
+     fi
+     ((ret+=$?))
+     echo "========================================================================"
+ }
+ 
+-
+ if (( ${#filenames[@]} <= 0 )); then
+     echo "Image: $image: $(du -h $image | while read a b || [ -n "$a" ]; do echo $a;done)"
+     echo "========================================================================"
+-- 
+2.16.3
+

0573-lsinitrd.sh-quote-filename-in-extract_files.patch

@@ -0,0 +1,25 @@
+From 0bb520ee706a0927f538004e2acb50d8c2b469b3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 18 Jan 2018 10:17:42 +0100
+Subject: [PATCH 2/2] lsinitrd.sh: quote filename in extract_files()
+
+---
+ lsinitrd.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lsinitrd.sh b/lsinitrd.sh
+index 9c7a178b..da7bf044 100755
+--- a/lsinitrd.sh
++++ b/lsinitrd.sh
+@@ -120,7 +120,7 @@ extract_files()
+     for f in "${!filenames[@]}"; do
+         [[ $nofileinfo ]] || echo "initramfs:/$f"
+         [[ $nofileinfo ]] || echo "========================================================================"
+-        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
++        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout "$f" 2>/dev/null
+         ((ret+=$?))
+         [[ $nofileinfo ]] || echo "========================================================================"
+         [[ $nofileinfo ]] || echo
+-- 
+2.16.3
+

dracut.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 14 12:26:02 UTC 2018 - daniel.molkentin@suse.com
+
+- 40network: Fix static network setup (bsc#1091099)
+  * adds 0571-40network-Fix-static-network-setup.patch
+
+- lsinitrd: Fix cat: write error: Broken pipe error (bsc#1094603)
+  * adds 0572-lsinitrd-no-more-cat-write-error-Broken-pipe.patch
+  * adds 0573-lsinitrd.sh-quote-filename-in-extract_files.patch
+
 -------------------------------------------------------------------
 Thu Jun 14 11:48:42 UTC 2018 - daniel.molkentin@suse.com
 

dracut.spec

@@ -396,6 +396,11 @@ Patch568:       0568-95multipath-Pickup-files-in-etc-multipath-conf.d.patch
 Patch569:       0569-10i18n-Load-all-keymaps-for-a-given-locale.patch
 # Applied upstream as a4e11a0e4d6fbed25244cc0f01732f81841bd642
 Patch570:       0570-10i18n-Fix-possible-infinite-recursion.patch
+Patch571:       0571-40network-Fix-static-network-setup.patch
+# Patch adopted from upstream commit bce6823a19b3fc0be50ff5c29c5ef90fa58b3430
+Patch572:       0572-lsinitrd-no-more-cat-write-error-Broken-pipe.patch
+# Patch adopted from upstream commit 8379784a0e8e38b85f36cb605a323dce02fd76b5
+Patch573:       0573-lsinitrd.sh-quote-filename-in-extract_files.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -689,6 +694,9 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh
 %patch568 -p1
 %patch569 -p1
 %patch570 -p1
+%patch571 -p1
+%patch572 -p1
+%patch573 -p1
 
 %build
 %configure\