summaryrefslogtreecommitdiffstats
path: root/zebra
diff options
context:
space:
mode:
Diffstat (limited to 'zebra')
-rw-r--r--zebra/interface.c6
-rw-r--r--zebra/rtadv.c7
2 files changed, 10 insertions, 3 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;
}
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index e8c223f2..9528a31a 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -1585,7 +1585,12 @@ rtadv_config_write (struct vty *vty, struct interface *ifp)
if (zif->rtadv.AdvSendAdvertisements)
vty_out (vty, " no ipv6 nd suppress-ra%s", VTY_NEWLINE);
else
- vty_out (vty, " ipv6 nd suppress-ra%s", VTY_NEWLINE);
+ {
+ if (vty_prepending (vty))
+ vty_prepend (vty, " ipv6 nd suppress-ra%s", VTY_NEWLINE);
+ else
+ vty_out (vty, " ipv6 nd suppress-ra%s", VTY_NEWLINE);
+ }
}