summaryrefslogtreecommitdiffstats
path: root/zebra/interface.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-02-05 09:51:37 +0100
committerDavid Lamparter <equinox@diac24.net>2010-02-05 09:51:37 +0100
commit1bc5254798593fae60361dfac8b853f6c356895c (patch)
tree43d5d2da847ec3b1b84fe7b6b9787025c8ed75c0 /zebra/interface.c
parentea7415e08c20dbcb97e287cd2a6a9bacaedf440f (diff)
parent55d24e7f3dbc69db37781dbff325bda0779778df (diff)
downloadquagga-1bc5254798593fae60361dfac8b853f6c356895c.tar.bz2
quagga-1bc5254798593fae60361dfac8b853f6c356895c.tar.xz
Merge branch 'current' into dn42quagga_1.1.0-dn42.11-rc0
Diffstat (limited to 'zebra/interface.c')
-rw-r--r--zebra/interface.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index e19648d7..23554620 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1753,7 +1753,7 @@ if_config_write (struct vty *vty)
if_data = ifp->info;
- vty_out (vty, "interface %s%s", ifp->name,
+ vty_prepend (vty, "interface %s%s", ifp->name,
VTY_NEWLINE);
if (ifp->desc)
@@ -1821,7 +1821,9 @@ if_config_write (struct vty *vty)
irdp_config_write (vty, ifp);
#endif /* IRDP */
- vty_out (vty, "!%s", VTY_NEWLINE);
+ if (!vty_prepending (vty))
+ vty_out (vty, "!%s", VTY_NEWLINE);
+ vty_unprepend (vty);
}
return 0;
}