diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-03-24 17:31:06 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-03-24 17:31:06 -0700 |
| commit | 5bc08f276717e16dc73ea76c17473682ecce8de1 (patch) | |
| tree | d8282205e2dd4e487f50f8b05cb28c51891a9d50 | |
| parent | 7ba08034c65ed8696db8a84d65a5c65ae4dfd450 (diff) | |
| parent | b13ba43f2d8abaf5445a76954893695cd54061eb (diff) | |
| download | vyatta-cfg-quagga-5bc08f276717e16dc73ea76c17473682ecce8de1.tar.gz vyatta-cfg-quagga-5bc08f276717e16dc73ea76c17473682ecce8de1.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | templates/interfaces/bonding/node.tag/description/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/bridge/node.tag/description/node.def | 4 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/description/node.def | 4 |
6 files changed, 30 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 219b68d0..a51d2a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +vyatta-cfg-system (0.15.5) unstable; urgency=low + + * Save interface description in kernel + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Mon, 23 Mar 2009 12:27:42 -0700 + +vyatta-cfg-system (0.15.4) unstable; urgency=low + + [ Stephen Hemminger ] + * Change update to create on multi-nodes + + [ Mohit Mehta ] + * will help debug bug 4181 if and when it happens + + [ An-Cheng Huang ] + * use renamed tacplus package + + -- An-Cheng Huang <ancheng@vyatta.com> Mon, 23 Mar 2009 11:11:38 -0700 + vyatta-cfg-system (0.15.3-14) unstable; urgency=low * Fix 4190: vrrp may fail to start daemon if previous commit of vrrp diff --git a/debian/control b/debian/control index 7bbb5f26..077402e1 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Depends: sed (>= 4.1.5), mdadm, ddclient, libio-socket-ssl-perl, - pam-tacplus + tacplus Pre-Depends: bash-completion Suggests: util-linux (>= 2.13-5), acpid, diff --git a/templates/interfaces/bonding/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/description/node.def index aeb40f0b..76140377 100644 --- a/templates/interfaces/bonding/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/description/node.def @@ -1,2 +1,4 @@ type: txt help: Set description for this interface +create: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias" +delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def index aeb40f0b..49a72afe 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def @@ -1,2 +1,4 @@ type: txt help: Set description for this interface +create: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" +delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def index 50250a24..76140377 100644 --- a/templates/interfaces/bridge/node.tag/description/node.def +++ b/templates/interfaces/bridge/node.tag/description/node.def @@ -1,2 +1,4 @@ type: txt -help: Set a description of the interface +help: Set description for this interface +create: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias" +delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def index b53ae684..76140377 100644 --- a/templates/interfaces/tunnel/node.tag/description/node.def +++ b/templates/interfaces/tunnel/node.tag/description/node.def @@ -1,2 +1,4 @@ type: txt -help: Set description of this tunnel interface +help: Set description for this interface +create: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias" +delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" |