Merge branch 'SUSE/049' of github.com:openSUSE/dracut into SUSE/049

author Daniel Molkentin <dmolkentin@suse.com>

Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)

committer Daniel Molkentin <dmolkentin@suse.com>

Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)
author Daniel Molkentin <dmolkentin@suse.com>
Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)
committer Daniel Molkentin <dmolkentin@suse.com>
Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)
diff --cc Makefile
Simple merge
diff --cc modules.d/35network-legacy/ifup.sh
Simple merge
diff --cc modules.d/40network/net-lib.sh
Simple merge
diff --cc modules.d/95dcssblk/parse-dcssblk.sh

index 27ac1d8d416417afd0a52108acfc1912a1969c19,8f17440873136926db6975a0ab37b8ad3bae262d..27ac1d8d416417afd0a52108acfc1912a1969c19

mode 100644,100755..100755
--- 1/modules.d/95dcssblk/parse-dcssblk.sh
--- 2/modules.d/95dcssblk/parse-dcssblk.sh
+++ b/modules.d/95dcssblk/parse-dcssblk.sh
author	Daniel Molkentin <dmolkentin@suse.com>
	Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)
committer	Daniel Molkentin <dmolkentin@suse.com>
	Wed, 24 Apr 2019 09:06:52 +0000 (11:06 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/35network-legacy/ifup.sh	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/40network/net-lib.sh	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/95dcssblk/parse-dcssblk.sh	patch \|	diff1 \|	diff2 \|	blob \| history