diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-03-13 15:50:41 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-03-13 15:50:41 -0700 |
| commit | 88826360c8e22d44be9d659224d8975743aa2e15 (patch) | |
| tree | 9fbd0376e77302f08686257f859201a592ae08e4 | |
| parent | 18f0f0ae25480d6b56a15dbaff97a6d4aba3fd6e (diff) | |
| parent | 52213005093f8604899716749591cf8399d66cec (diff) | |
| download | vyatta-op-88826360c8e22d44be9d659224d8975743aa2e15.tar.gz vyatta-op-88826360c8e22d44be9d659224d8975743aa2e15.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | etc/bash_completion.d/vyatta-op | 3 | ||||
| -rw-r--r-- | templates/connect/interface/node.tag/node.def | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 82392e3..86e17bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +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 + 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 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 () { 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 |