From 01ad4f33ed489d2ffa4ab55ec72a17609694a0cf Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 5 Apr 2018 14:51:34 +0200
Subject: [PATCH] platform: adjust format for nm_platform_lnk_tun_to_string()
 and print "persist"

Switch from "pi on|off" to optinally printing "pi" to indicate
whether the flag is set. That follows ip-tuntap syntax and is
more familiar:

    $ ip tuntap help
    Usage: ip tuntap { add | del | show | list | lst | help } [ dev PHYS_DEV ]
              [ mode { tun | tap } ] [ user USER ] [ group GROUP ]
              [ one_queue ] [ pi ] [ vnet_hdr ] [ multi_queue ] [ name NAME ]

    Where: USER  := { STRING | NUMBER }
           GROUP := { STRING | NUMBER }

Also, print the "persist" flag.
---
 src/platform/nm-platform.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index f380447015..e264324aa0 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -5121,16 +5121,18 @@ nm_platform_lnk_tun_to_string (const NMPlatformLnkTun *lnk, char *buf, gsize len
 
 	g_snprintf (buf, len,
 	            "%s" /* type */
-	            " pi %s" /* pi */
-	            " vnet_hdr %s" /* vnet_hdr */
+	            "%s" /* pi */
+	            "%s" /* vnet_hdr */
 	            "%s" /* multi_queue */
+	            "%s" /* persist */
 	            "%s" /* owner */
 	            "%s" /* group */
 	            "",
 	            type,
-	            lnk->pi ? "on" : "off",
-	            lnk->vnet_hdr ? "on" : "off",
+	            lnk->pi ? " pi" : "",
+	            lnk->vnet_hdr ? " vnet_hdr" : "",
 	            lnk->multi_queue ? " multi_queue" : "",
+	            lnk->persist ? " persist" : "",
 	            lnk->owner_valid ? nm_sprintf_buf (str_owner, " owner %u", (guint) lnk->owner) : "",
 	            lnk->group_valid ? nm_sprintf_buf (str_group, " group %u", (guint) lnk->group) : "");
 	return buf;