From c66986f95d5bab37bca9ee056006db9f8e75cd69 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Mon, 26 Oct 2020 20:30:12 +0800
Subject: [PATCH 1/2] [patch tracking] 20201026203007664078 -
 https://github.com/dracutdevs/dracut/commit/e4483e5917b59918260ff0f0345abbea4a537f12

---
 ...3e5917b59918260ff0f0345abbea4a537f12.patch | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 e4483e5917b59918260ff0f0345abbea4a537f12.patch

diff --git a/e4483e5917b59918260ff0f0345abbea4a537f12.patch b/e4483e5917b59918260ff0f0345abbea4a537f12.patch
new file mode 100644
index 0000000..7ca6b99
--- /dev/null
+++ b/e4483e5917b59918260ff0f0345abbea4a537f12.patch
@@ -0,0 +1,72 @@
+diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
+index 7ce7df2ce..3524adfd9 100644
+--- a/dracut.cmdline.7.asc
++++ b/dracut.cmdline.7.asc
+@@ -667,9 +667,13 @@ interface name. Better name it "bootnet" or "bluesocket".
+     Bond without parameters assumes
+     bond=bond0:eth0,eth1:mode=balance-rr
+ 
+-**team=**__<teammaster>__:__<teamslaves>__::
++**team=**__<teammaster>__:__<teamslaves>__[:__<teamrunner>__]::
+     Setup team device <teammaster> on top of <teamslaves>.
+     <teamslaves> is a comma-separated list of physical (ethernet) interfaces.
++    <teamrunner> is the runner type to be used (see *teamd.conf*(5)); defaults to
++    activebackup.
++    Team without parameters assumes
++    team=team0:eth0,eth1:activebackup
+ 
+ **bridge=**__<bridgename>__:__<ethnames>__::
+     Setup bridge <bridgename> with <ethnames>. <ethnames> is a comma-separated
+diff --git a/modules.d/35network-legacy/parse-team.sh b/modules.d/35network-legacy/parse-team.sh
+index a6eef18ef..03fbcf20d 100755
+--- a/modules.d/35network-legacy/parse-team.sh
++++ b/modules.d/35network-legacy/parse-team.sh
+@@ -1,9 +1,12 @@
+ #!/bin/sh
+ #
+ # Format:
+-#       team=<teammaster>:<teamslaves>
++#       team=<teammaster>:<teamslaves>[:<teamrunner>]
+ #
+ #       teamslaves is a comma-separated list of physical (ethernet) interfaces
++#       teamrunner is the runner type to be used (see teamd.conf(5)); defaults to activebackup
++#
++#       team without parameters assumes team=team0:eth0,eth1:activebackup
+ #
+ 
+ parseteam() {
+@@ -15,8 +18,11 @@ parseteam() {
+     done
+ 
+     case $# in
+-    2)  teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;;
+-    *)  die "team= requires two parameters" ;;
++    0)  teammaster=team0; teamslaves="eth0 eth1"; teamrunner="activebackup" ;;
++    1)  teammaster=$1; teamslaves="eth0 eth1"; teamrunner="activebackup" ;;
++    2)  teammaster=$1; teamslaves=$(str_replace "$2" "," " "); teamrunner="activebackup" ;;
++    3)  teammaster=$1; teamslaves=$(str_replace "$2" "," " "); teamrunner=$3 ;;
++    *)  die "team= requires zero to three parameters" ;;
+     esac
+     return 0
+ }
+@@ -26,16 +32,18 @@ for team in $(getargs team); do
+ 
+     unset teammaster
+     unset teamslaves
++    unset teamrunner
+ 
+     parseteam "$team" || continue
+ 
+     echo "teammaster=$teammaster" > /tmp/team.${teammaster}.info
+     echo "teamslaves=\"$teamslaves\"" >> /tmp/team.${teammaster}.info
++    echo "teamrunner=\"$teamrunner\"" >> /tmp/team.${teammaster}.info
+ 
+     if ! [ -e /etc/teamd/${teammaster}.conf ]; then
+-        warn "Team master $teammaster specified, but no /etc/teamd/$teammaster.conf present. Using activebackup."
++        warn "Team master $teammaster specified, but no /etc/teamd/$teammaster.conf present. Using $teamrunner."
+         mkdir -p /etc/teamd
+-        printf -- "%s" '{"runner": {"name": "activebackup"}, "link_watch": {"name": "ethtool"}}' > "/etc/teamd/${teammaster}.conf"
++        printf -- "%s" "{\"runner\": {\"name\": \"$teamrunner\"}, \"link_watch\": {\"name\": \"ethtool\"}}" > "/tmp/${teammaster}.conf"
+     fi
+ done
+ 
-- 
Gitee


From 638e551fdbdb3508c0734fc0932580c7e29721c2 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Mon, 26 Oct 2020 20:30:13 +0800
Subject: [PATCH 2/2] [patch tracking] 20201026203007664078 - update spec file

---
 dracut.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dracut.spec b/dracut.spec
index a852222..496e847 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,7 @@ 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: e4483e5917b59918260ff0f0345abbea4a537f12.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source2: openEuler.conf.example
@@ -488,6 +489,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %endif
 
 %changelog
+* 20201026203007664078 patch-tracking 050-4
+- append patch file of upstream repository from <e4483e5917b59918260ff0f0345abbea4a537f12> to <e4483e5917b59918260ff0f0345abbea4a537f12>
+
 * Thu Jul 23 2020 Liquor <lirui130@huawei.com> - 050-1
 - Update to 050
 
@@ -516,4 +520,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