[lnst] Use team device instead of pidfile argument

[Jiří Pírko]

commit dc82916f95562114901220c73f30923196408210
Author: Jan Tluka <jtluka(a)redhat.com&gt;
Date:   Thu Jul 4 17:16:14 2013 +0200

    Use team device instead of pidfile argument
    
    Without this fix LNST will fail if used with teamd-1.3 on team device
    deconfiguration. This is a bug both in libteam and LNST. Based on
    Jiri Pirko's recommendation I'm removing pidfile generation from LNST code
    and using device argument instead for team device removal.
    
    Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt;
    Signed-off-by: Jiri Pirko <jiri(a)resnulli.us&gt;

 lnst/Slave/NetConfigDevice.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index 55e3ea5..6fcd4b5 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -221,7 +221,6 @@ def prepare_json_str(json_str):
     return json_str
 
 class NetConfigDeviceTeam(NetConfigDeviceGeneric):
-    _pidfile = None
     _modulename = "team_mode_roundrobin team_mode_activebackup team_mode_broadcast
team_mode_loadbalance team"
     _moduleload = False
     _cleanupcmd = "killall -q teamd"
@@ -249,12 +248,9 @@ class NetConfigDeviceTeam(NetConfigDeviceGeneric):
         teamd_config = prepare_json_str(teamd_config)
 
         dev_name = self._netdev["name"]
-        pidfile = "/var/run/teamd_%s.pid" % dev_name
 
         dbus_option = " -D" if self._should_enable_dbus() else ""
-        exec_cmd("teamd -r -d -c \"%s\" -t %s -p %s%s" %
(teamd_config, dev_name, pidfile, dbus_option))
-
-        self._pidfile = pidfile
+        exec_cmd("teamd -r -d -c \"%s\" -t %s %s" % (teamd_config,
dev_name, dbus_option))
 
         for slave_id in get_slaves(self._netdev):
             self.slave_add(slave_id)
@@ -265,9 +261,8 @@ class NetConfigDeviceTeam(NetConfigDeviceGeneric):
             self.slave_del(slave_id)
 
         dev_name = self._netdev["name"]
-        pidfile = "/var/run/teamd_%s.pid" % dev_name
 
-        exec_cmd("teamd -k -p %s" % pidfile)
+        exec_cmd("teamd -k -t %s" % dev_name)
 
     def slave_add(self, slaveid):
         dev_name = self._netdev["name"]