diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-02-27 12:50:09 -0800 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-02-27 12:50:09 -0800 |
| commit | 802132d192e23332edf3e08b7fdfe75fc7b1bc7a (patch) | |
| tree | aabcd25bbd1cf479547b1f6b7e64b258f8a47615 | |
| parent | bfd16913b27d6c94e6551bf17669c9c578bc463f (diff) | |
| parent | 210ad3ed32aeacacb0c9435ef11b770b04e135ed (diff) | |
| download | vyatta-cluster-802132d192e23332edf3e08b7fdfe75fc7b1bc7a.tar.gz vyatta-cluster-802132d192e23332edf3e08b7fdfe75fc7b1bc7a.zip | |
Merge branch 'glendale' of git:/git/vyatta-cluster into glendale
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | templates-op/show/cluster/status/node.def | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 03c49e0..9531f18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates share_perl5dir = $(datadir)/perl5 -bin_sudo_usersdir = $(bindir)/sudo-users curverdir = $(sysconfdir)/config-migrate/current sbin_SCRIPTS = scripts/vyatta-update-cluster.pl -bin_sudo_users_SCRIPTS = scripts/vyatta-show-cluster.pl +sbin_SCRIPTS += scripts/vyatta-show-cluster.pl share_perl5_DATA = scripts/VyattaClusterConfig.pm curver_DATA = cfg-version/cluster@1 diff --git a/templates-op/show/cluster/status/node.def b/templates-op/show/cluster/status/node.def index 564f926..aff3731 100644 --- a/templates-op/show/cluster/status/node.def +++ b/templates-op/show/cluster/status/node.def @@ -1,2 +1,2 @@ help: Show the current clustering status -run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-cluster.pl +run: ${vyatta_sbindir}/vyatta-show-cluster.pl |