From f7f59377a46149ea45608b20064bbb67394ae7f8 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 13 Mar 2012 21:30:29 +0000
Subject: Bugfix 7527: Don't override VYATTA_PAGER value if it was previously
 set

---
 etc/bash_completion.d/vyatta-op | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/vyatta-op b/etc/bash_completion.d/vyatta-op
index f638488..65dd701 100644
--- a/etc/bash_completion.d/vyatta-op
+++ b/etc/bash_completion.d/vyatta-op
@@ -32,7 +32,8 @@ test -z "$_vyatta_default_pager" && \
 	--auto-buffers\
 	--no-lessopen\
 	$_vyatta_less_options"
-declare -x VYATTA_PAGER=$_vyatta_default_pager
+test -z "$VYATTA_PAGER" && \
+    declare -x VYATTA_PAGER=$_vyatta_default_pager
 
 _vyatta_op_do_key_bindings ()
 {
-- 
cgit v1.2.3


From e4938c0d6f527ded7ea46f0d25a22aaba0d67110 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 13 Mar 2012 21:33:56 +0000
Subject: 0.13.245+oxnard4

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 82392e3..78a2655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-op (0.13.245+oxnard4) unstable; urgency=low
+
+  * Bugfix 7527: Don't override VYATTA_PAGER value if it was previously
+    set
+
+ -- John Southworth <john.southworth@vyatta.com>  Tue, 13 Mar 2012 21:33:56 +0000
+
 vyatta-op (0.13.245+oxnard3) unstable; urgency=low
 
   * ping: fix error handling
-- 
cgit v1.2.3


From 9d18696fd5d8f85c047a737d7f283c7172e81e17 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 13 Mar 2012 22:38:31 +0000
Subject: Bugfix 7896: make the pppoe log write as the root user

---
 templates/connect/interface/node.tag/node.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/connect/interface/node.tag/node.def b/templates/connect/interface/node.tag/node.def
index dd806e3..ab53eb8 100644
--- a/templates/connect/interface/node.tag/node.def
+++ b/templates/connect/interface/node.tag/node.def
@@ -22,7 +22,7 @@ run:
 			/dev/null 2>&1 & )
 		else
                     # PPPOE, PPPOA, WLM interfaces are started directly
-                    ( umask 0; sudo /usr/sbin/pppd call $IFNAME > \
-                        /tmp/${IFNAME}.log 2>&1 & )
+                    ( umask 0; sudo /usr/sbin/pppd call $IFNAME \
+                               | sudo tee /tmp/${IFNAME}.log 2>&1 & )
 		fi
         fi
-- 
cgit v1.2.3


From 52213005093f8604899716749591cf8399d66cec Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 13 Mar 2012 22:39:02 +0000
Subject: 0.13.245+oxnard5

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 78a2655..86e17bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.245+oxnard5) unstable; urgency=low
+
+  * Bugfix 7896: make the pppoe log write as the root user
+
+ -- John Southworth <john.southworth@vyatta.com>  Tue, 13 Mar 2012 22:39:02 +0000
+
 vyatta-op (0.13.245+oxnard4) unstable; urgency=low
 
   * Bugfix 7527: Don't override VYATTA_PAGER value if it was previously
-- 
cgit v1.2.3