From 1b0e733d6a7cb5d677cf187950549f080970ef64 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 15 Nov 2020 02:30:12 +0800
Subject: [PATCH 1/3] [patch tracking] 20201115023007670280 -
 https://github.com/dracutdevs/dracut/commit/e0524af2bf83184e18d068bea4356a719d2385c2

---
 ...4af2bf83184e18d068bea4356a719d2385c2.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 e0524af2bf83184e18d068bea4356a719d2385c2.patch

diff --git a/e0524af2bf83184e18d068bea4356a719d2385c2.patch b/e0524af2bf83184e18d068bea4356a719d2385c2.patch
new file mode 100644
index 0000000..ecca62b
--- /dev/null
+++ b/e0524af2bf83184e18d068bea4356a719d2385c2.patch
@@ -0,0 +1,42 @@
+diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
+index 81db541c4..826317e4f 100755
+--- a/modules.d/95cifs/module-setup.sh
++++ b/modules.d/95cifs/module-setup.sh
+@@ -37,7 +37,13 @@ install() {
+     local _i
+     local _nsslibs
+     inst_multiple -o mount.cifs
+-    inst_multiple /etc/services /etc/nsswitch.conf /etc/protocols
++    inst_multiple /etc/nsswitch.conf
++    if [ $hostonly ]; then
++        getent services > ${initdir}/etc/services
++        getent protocols > ${initdir}/etc/protocols
++    else
++        inst_multiple /etc/services /etc/protocols
++    fi
+ 
+     inst_libdir_file 'libcap-ng.so*'
+ 
+diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
+index cfe0b965a..0a2a7ab34 100755
+--- a/modules.d/95nfs/module-setup.sh
++++ b/modules.d/95nfs/module-setup.sh
+@@ -77,8 +77,16 @@ cmdline() {
+ install() {
+     local _i
+     local _nsslibs
+-    inst_multiple -o rpc.idmapd mount.nfs mount.nfs4 umount sed /etc/netconfig chmod "$tmpfilesdir/rpcbind.conf"
+-    inst_multiple /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
++    inst_multiple -o portmap rpcbind rpc.statd mount.nfs \
++        mount.nfs4 umount rpc.idmapd sed /etc/netconfig chmod "$tmpfilesdir/rpcbind.conf"
++    inst_multiple /etc/nsswitch.conf /etc/idmapd.conf
++    if [ $hostonly ]; then
++        getent services > ${initdir}/etc/services
++        getent protocols > ${initdir}/etc/protocols
++        getent rpc > ${initdir}/etc/rpc
++    else
++        inst_multiple /etc/services /etc/protocols /etc/rpc
++    fi
+ 
+     if [[ $hostonly_cmdline == "yes" ]]; then
+         local _netconf="$(cmdline)"
-- 
Gitee


From 7587776d4b08835617ee178260fb066c63d51929 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 15 Nov 2020 02:30:13 +0800
Subject: [PATCH 2/3] [patch tracking] 20201115023007670280 -
 https://github.com/dracutdevs/dracut/commit/5840c466dcfe1c4322142980cac6606870bd586f

---
 5840c466dcfe1c4322142980cac6606870bd586f.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 5840c466dcfe1c4322142980cac6606870bd586f.patch

diff --git a/5840c466dcfe1c4322142980cac6606870bd586f.patch b/5840c466dcfe1c4322142980cac6606870bd586f.patch
new file mode 100644
index 0000000..0d43d57
--- /dev/null
+++ b/5840c466dcfe1c4322142980cac6606870bd586f.patch
@@ -0,0 +1,14 @@
+diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
+index 0a2a7ab34..4ba213368 100755
+--- a/modules.d/95nfs/module-setup.sh
++++ b/modules.d/95nfs/module-setup.sh
+@@ -122,7 +122,8 @@ install() {
+     inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
+     mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
+     mkdir -m 0770 -p "$initdir/var/lib/rpcbind"
+-    mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
++    [ -d "$initdir/var/lib/nfs/statd/sm" ] && mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
++    [ -d "$initdir/var/lib/nfs/sm" ] && mkdir -m 0755 -p "$initdir/var/lib/nfs/sm"
+ 
+     # Rather than copy the passwd file in, just set a user for rpcbind
+     # We'll save the state and restart the daemon from the root anyway
-- 
Gitee


From 02dc4b516ad646747e8d5488d5818e0b4579a0ee Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 15 Nov 2020 02:30:14 +0800
Subject: [PATCH 3/3] [patch tracking] 20201115023007670280 - update spec file

---
 dracut.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dracut.spec b/dracut.spec
index a852222..7617b6f 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -9,7 +9,7 @@
 
 Name: dracut
 Version: 050
-Release: 3
+Release: 4
 
 Summary: Initramfs generator using udev
 
@@ -38,6 +38,8 @@ Patch10: dracut-lib.sh-quote-variables-in-parameter-expansion.patch
 Patch11: dracut-90crypt-module-setup.sh-fix-force-on-multiple-lines.patch
 Patch12: Fix-test-in-lsinitrd.patch
 Patch13: add-option-to-include-file-metadata-in-initramfs.patch 
+Patch6000: e0524af2bf83184e18d068bea4356a719d2385c2.patch
+Patch6001: 5840c466dcfe1c4322142980cac6606870bd586f.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source2: openEuler.conf.example
@@ -488,6 +490,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %endif
 
 %changelog
+* 20201115023007670280 patch-tracking 050-4
+- append patch file of upstream repository from <e0524af2bf83184e18d068bea4356a719d2385c2> to <5840c466dcfe1c4322142980cac6606870bd586f>
+
 * Thu Jul 23 2020 Liquor <lirui130@huawei.com> - 050-1
 - Update to 050
 
@@ -516,4 +521,4 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 - Delete redundant information
 
 * Thu Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 049-1
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee